Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fills Refactor #109

Merged
merged 3 commits into from
May 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugin-src/transformers/partials/transformFills.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { translateFills } from '@plugin/translators';
import { translateFills } from '@plugin/translators/fills';

import { ShapeAttributes } from '@ui/lib/types/shapes/shape';

Expand Down
2 changes: 1 addition & 1 deletion plugin-src/transformers/partials/transformVectorPaths.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
transformStrokes
} from '@plugin/transformers/partials';
import { createLineGeometry, translateVectorPath, translateVectorPaths } from '@plugin/translators';
import { translateFills } from '@plugin/translators';
import { translateFills } from '@plugin/translators/fills';

import { PathAttributes } from '@ui/lib/types/shapes/pathShape';
import { PathShape } from '@ui/lib/types/shapes/pathShape';
Expand Down
2 changes: 1 addition & 1 deletion plugin-src/transformers/transformPageNode.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { transformChildren } from '@plugin/transformers/partials';
import { translatePageFill } from '@plugin/translators';
import { translatePageFill } from '@plugin/translators/fills';

import { PenpotPage } from '@ui/lib/types/penpotPage';

Expand Down
2 changes: 2 additions & 0 deletions plugin-src/translators/fills/gradients/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from './translateGradientLinearFill';
export * from './translateGradientRadialFill';
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { calculateLinearGradient, rgbToHex } from '@plugin/utils';

import { Fill } from '@ui/lib/types/utils/fill';

export const translateGradientLinearFill = (fill: GradientPaint): Fill => {
const points = calculateLinearGradient(fill.gradientTransform);

return {
fillColorGradient: {
type: 'linear',
startX: points.start[0],
startY: points.start[1],
endX: points.end[0],
endY: points.end[1],
width: 1,
stops: fill.gradientStops.map(stop => ({
color: rgbToHex(stop.color),
offset: stop.position,
opacity: stop.color.a * (fill.opacity ?? 1)
}))
},
fillOpacity: !fill.visible ? 0 : fill.opacity
};
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { calculateRadialGradient, rgbToHex } from '@plugin/utils';

import { Fill } from '@ui/lib/types/utils/fill';

export const translateGradientRadialFill = (fill: GradientPaint): Fill => {
const points = calculateRadialGradient(fill.gradientTransform);

return {
fillColorGradient: {
type: 'radial',
startX: points.start[0],
startY: points.start[1],
endX: points.end[0],
endY: points.end[1],
width: 1,
stops: fill.gradientStops.map(stop => ({
color: rgbToHex(stop.color),
offset: stop.position,
opacity: stop.color.a * (fill.opacity ?? 1)
}))
},
fillOpacity: !fill.visible ? 0 : fill.opacity
};
};
3 changes: 3 additions & 0 deletions plugin-src/translators/fills/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export * from './translateFills';
export * from './translateImageFill';
export * from './translateSolidFill';
49 changes: 49 additions & 0 deletions plugin-src/translators/fills/translateFills.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import { translateImageFill, translateSolidFill } from '@plugin/translators/fills';
import {
translateGradientLinearFill,
translateGradientRadialFill
} from '@plugin/translators/fills/gradients';
import { rgbToHex } from '@plugin/utils';

import { Fill } from '@ui/lib/types/utils/fill';

export const translateFill = async (fill: Paint): Promise<Fill | undefined> => {
switch (fill.type) {
case 'SOLID':
return translateSolidFill(fill);
case 'GRADIENT_LINEAR':
return translateGradientLinearFill(fill);
case 'GRADIENT_RADIAL':
return translateGradientRadialFill(fill);
case 'IMAGE':
return await translateImageFill(fill);
}

console.error(`Unsupported fill type: ${fill.type}`);
};

export const translateFills = async (
fills: readonly Paint[] | typeof figma.mixed
): Promise<Fill[]> => {
const figmaFills = fills === figma.mixed ? [] : fills;
const penpotFills: Fill[] = [];

for (const fill of figmaFills) {
const penpotFill = await translateFill(fill);
if (penpotFill) {
// fills are applied in reverse order in Figma, that's why we unshift
penpotFills.unshift(penpotFill);
}
}

return penpotFills;
};

export const translatePageFill = (fill: Paint): string | undefined => {
switch (fill.type) {
case 'SOLID':
return rgbToHex(fill.color);
}

console.error(`Unsupported page fill type: ${fill.type}`);
};
36 changes: 36 additions & 0 deletions plugin-src/translators/fills/translateImageFill.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import { detectMimeType } from '@plugin/utils';

import { Fill } from '@ui/lib/types/utils/fill';
import { ImageColor } from '@ui/lib/types/utils/imageColor';

export const translateImageFill = async (fill: ImagePaint): Promise<Fill | undefined> => {
const fillImage = await translateImage(fill.imageHash);
if (!fillImage) return;

return {
fillOpacity: !fill.visible ? 0 : fill.opacity,
fillImage: fillImage
};
};

const translateImage = async (imageHash: string | null): Promise<ImageColor | undefined> => {
if (!imageHash) return;

const image = figma.getImageByHash(imageHash);
if (!image) return;

const bytes = await image.getBytesAsync();
const size = await image.getSizeAsync();
const b64 = figma.base64Encode(bytes);
const mimeType = detectMimeType(b64);
const dataUri = `data:${mimeType};base64,${b64}`;

return {
width: size.width,
height: size.height,
mtype: mimeType,
keepAspectRatio: true,
dataUri: dataUri,
id: '00000000-0000-0000-0000-000000000000'
};
};
10 changes: 10 additions & 0 deletions plugin-src/translators/fills/translateSolidFill.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { rgbToHex } from '@plugin/utils';

import { Fill } from '@ui/lib/types/utils/fill';

export const translateSolidFill = (fill: SolidPaint): Fill => {
return {
fillColor: rgbToHex(fill.color),
fillOpacity: !fill.visible ? 0 : fill.opacity
};
};
1 change: 0 additions & 1 deletion plugin-src/translators/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
export * from './translateBlendMode';
export * from './translateBlurEffects';
export * from './translateFills';
export * from './translateShadowEffects';
export * from './translateStrokes';
export * from './translateVectorPaths';
2 changes: 1 addition & 1 deletion plugin-src/translators/text/translateStyleTextSegments.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { translateFills } from '@plugin/translators';
import { translateFills } from '@plugin/translators/fills';
import { translateFontId } from '@plugin/translators/text/font';
import { StyleTextSegment, translateParagraphProperties } from '@plugin/translators/text/paragraph';
import {
Expand Down
127 changes: 0 additions & 127 deletions plugin-src/translators/translateFills.ts

This file was deleted.

2 changes: 1 addition & 1 deletion plugin-src/translators/translateStrokes.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { translateFill } from '@plugin/translators/translateFills';
import { translateFill } from '@plugin/translators/fills';

import { Stroke, StrokeAlignment, StrokeCaps } from '@ui/lib/types/utils/stroke';

Expand Down