@apify/ui-library 0.74.2-featCodeBlockWithTabsoptimis-e30911.3 → 0.74.2-featcolortokens-178953.24

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@apify/ui-library",
-    "version": "0.74.2-featCodeBlockWithTabsoptimis-e30911.3+cef0941ab85",
+    "version": "0.74.2-featcolortokens-178953.24+d785ae43897",
     "description": "React UI library used by apify.com",
     "license": "Apache-2.0",
     "type": "module",
@@ -17,8 +17,8 @@
         "build": "npm run clean && npm run compile",
         "clean": "rimraf ./dist",
         "compile": "tsc -p tsconfig.build.json",
-        "generate-theme": "node ./src/codemods/generate_color_theme_files.mjs && node src/codemods/generate_color_property_tokens.mjs && node src/codemods/generate_typograpy_tokens_files.mjs  && npm run lint:fix",
-        "generate-color-definition": "node ./src/design_system/generate_color_definitions.js",
+        "generate-theme": "node src/codemods/generate_typograpy_tokens_files.mjs  && npm run lint:fix",
+        "build-color-tokens": "node src/design_system/colors/build_color_tokens.js",
         "postpublish": "npm run clean"
     },
     "//": [
@@ -63,8 +63,14 @@
         "eslint-plugin-react-hooks": "^4.6.0",
         "eslint-plugin-sonarjs": "^1.0.3",
         "recast": "^0.23.9",
+        "style-dictionary": "^4.4.0",
         "typescript": "^5.1.6",
         "typescript-eslint": "^8.24.0"
     },
-    "gitHead": "cef0941ab85d9a8d282c8e4e7fee14500fb39fe9"
+    "files": [
+        "dist",
+        "src",
+        "style"
+    ],
+    "gitHead": "d785ae43897eefe9e3152ed27bb293f20694c389"
 }

package/src/components/code/code_block/code_block_with_tabs.tsx

@@ -74,8 +74,6 @@ type CodeBlockWithTabsProps = SharedBoxProps & {
     codeBlockProps: SharedCodeBlockProps;
     currentTabKey: CodeBlockTabKey;
     tabs: CodeBlockTabProps[];
-    // Optional prop to set the selected tab, does not influence the content of the code block, used to improve interactivity
-    optimisticCurrentTabKey?: CodeBlockTabKey;
 };
 
 export const CODE_BLOCK_WITH_TABS_CLASSNAMES = {
@@ -192,7 +190,7 @@ const IMG_RESIZE = {
     height: 20,
 };
 
-export const CodeBlockWithTabs = ({ className, codeBlockProps, currentTabKey, tabs, optimisticCurrentTabKey, ...props }: CodeBlockWithTabsProps) => {
+export const CodeBlockWithTabs = ({ className, codeBlockProps, currentTabKey, tabs, ...props }: CodeBlockWithTabsProps) => {
     const { generateProxyImageUrl } = useSharedUiDependencies();
     const currentTab = tabs.find((tab) => tab.key === currentTabKey) ?? tabs[0];
 
@@ -201,7 +199,7 @@ export const CodeBlockWithTabs = ({ className, codeBlockProps, currentTabKey, ta
             <div className={CODE_BLOCK_WITH_TABS_CLASSNAMES.TABS}>
                 {tabs.map((tab) => {
                     const { label, src } = CODE_BLOCK_TAB_CATALOG[tab.key];
-                    const selected = (optimisticCurrentTabKey ?? currentTabKey) === tab.key;
+                    const selected = tab.key === currentTab?.key;
 
                     const commonProps = {
                         className: clsx(CODE_BLOCK_WITH_TABS_CLASSNAMES.TAB, { selected }),

package/src/design_system/colors/build_color_tokens.js

@@ -0,0 +1,183 @@
+import StyleDictionary from 'style-dictionary';
+
+const DO_NOT_EXPORT_COMMENT = `/**
+ * Do not edit directly, this file was auto-generated.
+ */
+`;
+
+function toCamelCase(str) {
+    return str
+        .toLowerCase()
+        .replace(/[^a-zA-Z0-9]+(.)/g, (_, chr) => chr.toUpperCase());
+}
+
+/**
+ * Converts an object to a TypeScript literal representation with proper indentation
+ * that can be written to a TypeScript file.
+ */
+function objectToTSLiteral(obj, indentLevel = 0) {
+    const indent = (level) => '    '.repeat(level); // 2-space indent
+
+    if (obj && typeof obj === 'object') {
+        const entries = Object.entries(obj);
+        if (entries.length === 0) return '{}';
+        return `{\n${entries
+            .map(
+                ([key, value]) => `${indent(indentLevel + 1)}${key}: ${objectToTSLiteral(value, indentLevel + 1)}`,
+            )
+            .join('\n')}\n${indent(indentLevel)}}${indentLevel > 0 ? ',' : ''}`;
+    } if (typeof obj === 'string') {
+        return `'${obj}',`;
+    }
+    return String(obj);
+}
+
+/**
+ * Build color tokens for a given theme.
+ * @param theme {string} - The theme to build tokens, 'light' or 'dark'.
+ */
+async function buildTheme(theme) {
+    // Transform to replace 'semantic' and 'decorative' with 'color' in token names
+    // Example: 'semantic-neutral-text' becomes 'color-neutral-text'
+    StyleDictionary.registerTransform({
+        name: 'name/prefix-color-name',
+        type: 'name',
+        transform: (prop) => {
+            return prop.name
+                .replace(/^semantic/, 'color')
+                .replace(/^decorative/, 'color');
+        },
+    });
+
+    // Format to generate typescript file that exports CSS variables as a string
+    // Example: export const tokens = `--color-neutral-text: #000; --color-primary: #fff;`
+    StyleDictionary.registerFormat({
+        name: 'typescript/css-variables-string',
+        format: ({ dictionary, options }) => {
+            const lines = dictionary.allTokens.map((token) => `  --${token.name}: ${token.$value};`);
+            return `${DO_NOT_EXPORT_COMMENT}\nexport const ${options.varName ?? 'tokens'} = \`\n${lines.join('\n')}\n\`;\n`;
+        },
+    });
+
+    // Format to generate typescript file that exports CSS properties as an object
+    // Example: export const tokens = { colorNeutralText: 'var(--color-neutral-text)', colorPrimary: 'var(--color-primary)' };
+    StyleDictionary.registerFormat({
+        name: 'typescript/css-color-properties',
+        format: ({ dictionary, options }) => {
+            const properties = {};
+            dictionary.allTokens.forEach((token) => {
+                const path = token.path.slice(1).map(toCamelCase);
+                let current = properties;
+                for (let i = 0; i < path.length - 1; i++) {
+                    const key = path[i];
+                    if (!(key in current)) {
+                        current[key] = {};
+                    }
+                    current = current[key];
+                }
+                current[path[path.length - 1]] = `var(--${token.name})`;
+            });
+
+            return `${DO_NOT_EXPORT_COMMENT}\nexport const ${options.varName ?? 'tokens'} = ${objectToTSLiteral(properties)} as const;\n`;
+        },
+    });
+
+    // Format to generate typescript file that exports CSS colors as an object
+    // Example: export const tokens = { colorNeutralText: '#000', colorPrimary: '#fff' };
+    StyleDictionary.registerFormat({
+        name: 'typescript/css-color-values',
+        format: ({ dictionary, options }) => {
+            const properties = {};
+            dictionary.allTokens.forEach((token) => {
+                const path = token.path.slice(1);
+                const name = toCamelCase(path.join(' '));
+                properties[name] = token.$value;
+            });
+
+            return `${DO_NOT_EXPORT_COMMENT}\nexport const ${options.varName ?? 'tokens'} = ${objectToTSLiteral(properties)} as const;\n`;
+        },
+    });
+
+    // Select only tokens for semantic and decorative colors
+    StyleDictionary.registerFilter({
+        name: 'only-colors',
+        filter: (token) => ['Semantic', 'Decorative'].includes(token.path[0]),
+    });
+
+    // Select only tokens for palette colors
+    StyleDictionary.registerFilter({
+        name: 'only-palette',
+        filter: (token) => ['Palette'].includes(token.path[0]),
+    });
+
+    // Select only tokens for theme colors (Decorative and Palette)
+    StyleDictionary.registerFilter({
+        name: 'only-theme',
+        filter: (token) => ['Decorative', 'Palette'].includes(token.path[0]),
+    });
+
+    const sd = await (new StyleDictionary()).extend({
+        source: [`src/design_system/colors/figma_color_tokens.${theme}.json`],
+        platforms: {
+            ts: {
+                transformGroup: 'scss',
+                transforms: ['name/prefix-color-name'],
+                buildPath: 'src/design_system/colors/generated/',
+                files: [
+                    {
+                        destination: `css_variables.${theme}.ts`,
+                        format: 'typescript/css-variables-string',
+                        filter: 'only-colors',
+                    },
+                    {
+                        destination: `css_variables_palette.${theme}.ts`,
+                        format: 'typescript/css-variables-string',
+                        filter: 'only-palette',
+                    },
+                    {
+                        destination: `properties_theme.ts`,
+                        format: 'typescript/css-color-properties',
+                        filter: 'only-colors',
+                        options: {
+                            varName: 'colorProperties',
+                        },
+                    },
+                    {
+                        destination: `colors_theme.${theme}.ts`,
+                        format: 'typescript/css-color-values',
+                        filter: 'only-theme',
+                        options: {
+                            varName: `${theme}Theme`,
+                        },
+                    },
+                ],
+            },
+            style: {
+                transformGroup: 'scss',
+                transforms: ['name/prefix-color-name'],
+                buildPath: 'style/colors/',
+                files: [
+                    {
+                        destination: `${theme}.scss`,
+                        format: 'scss/map-flat',
+                        mapName: 'tokens',
+                        filter: 'only-colors',
+                    },
+                    {
+                        destination: `palette.${theme}.scss`,
+                        format: 'scss/map-flat',
+                        mapName: 'tokens',
+                        filter: 'only-palette',
+                    },
+                ],
+            },
+        },
+    });
+    await sd.buildPlatform('ts');
+    await sd.buildPlatform('style');
+}
+
+await Promise.all([
+    buildTheme('light'),
+    buildTheme('dark'),
+]);