From 6c1170002cf1bf8575554995fb01e455d967a985 Mon Sep 17 00:00:00 2001 From: Taylor Seamans Date: Fri, 13 Dec 2024 13:22:01 -0800 Subject: [PATCH 1/6] Update tokens from Figma (#4575) * Remove text/icon xweak, brand * Rename enable to rest, adjusted token states * Incorporate changes into grommet-app * Create lovely-penguins-rule.md * Update .changeset/lovely-penguins-rule.md Co-authored-by: Taylor Seamans --------- Co-authored-by: Matthew Glissmann --- .changeset/lovely-penguins-rule.md | 11 + design-tokens/src/token_export.ts | 4 +- .../tokens/component/component.default.json | 1842 +++++++++-------- design-tokens/tokens/semantic/color.dark.json | 152 +- .../tokens/semantic/color.light.json | 154 +- sandbox/grommet-app/src/theme.jsx | 217 +- 6 files changed, 1234 insertions(+), 1146 deletions(-) create mode 100644 .changeset/lovely-penguins-rule.md diff --git a/.changeset/lovely-penguins-rule.md b/.changeset/lovely-penguins-rule.md new file mode 100644 index 000000000..d50f1e431 --- /dev/null +++ b/.changeset/lovely-penguins-rule.md @@ -0,0 +1,11 @@ +--- +"hpe-design-tokens": minor +--- + +- Removed `color.text.xweak`, `color.icon.xweak`, `color.text.brand`, `color.icon.brand` +- Renamed `enabled` in component tokens to `rest` +- Removed `checkbox.control.selected.disabled` (use `checkbox.control.disabled.rest`) +- Removed `radiobutton.control.selected.disabled` (use `radiobutton.control.disabled.rest`) +- Removed `dataCell.primary.disabled (use `dataCell.disabld.rest`) +- Updated Anchor token structure from `anchor.[size].default` to `anchor.default.[size]` in alignment with button token structure. +- Updated component state tokens for all but formField tokens to align with new state combinations. diff --git a/design-tokens/src/token_export.ts b/design-tokens/src/token_export.ts index dab49cb2f..197d10397 100644 --- a/design-tokens/src/token_export.ts +++ b/design-tokens/src/token_export.ts @@ -205,12 +205,12 @@ export function tokenFilesFromLocalVariables( let token: Token; // TO DO this is temp way of handling the gradient on the primary button background // which is only stored in code but handled as a solid color in Figma - if (variable.name === 'button/primary/enabled/background') { + if (variable.name === 'button/primary/rest/background') { const componentTokens = fs.readFileSync( 'tokens/component/component.default.json', ); const parsed = JSON.parse(componentTokens.toString()); - token = parsed.button.primary.enabled.background; + token = parsed.button.primary.rest.background; } else { token = { $type: tokenTypeFromVariable(variable), diff --git a/design-tokens/tokens/component/component.default.json b/design-tokens/tokens/component/component.default.json index fe2707319..97e8787db 100644 --- a/design-tokens/tokens/component/component.default.json +++ b/design-tokens/tokens/component/component.default.json @@ -1,7 +1,7 @@ { "button": { "primary": { - "enabled": { + "rest": { "background": { "$type": "gradient", "$value": { @@ -36,7 +36,7 @@ }, "borderColor": { "$type": "color", - "$value": "{button.default.enabled.borderColor}", + "$value": "{button.default.rest.borderColor}", "$description": "", "$extensions": { "com.figma": { @@ -96,63 +96,65 @@ } }, "disabled": { - "background": { - "$type": "color", - "$value": "{color.background.disabled}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL"], - "codeSyntax": {} + "rest": { + "background": { + "$type": "color", + "$value": "{color.background.disabled}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL"], + "codeSyntax": {} + } } - } - }, - "borderColor": { - "$type": "color", - "$value": "{button.default.enabled.borderColor}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["STROKE_COLOR", "EFFECT_COLOR"], - "codeSyntax": {} + }, + "borderColor": { + "$type": "color", + "$value": "{button.default.rest.borderColor}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["STROKE_COLOR", "EFFECT_COLOR"], + "codeSyntax": {} + } } - } - }, - "textColor": { - "$type": "color", - "$value": "{color.text.disabled}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["TEXT_FILL"], - "codeSyntax": {} + }, + "textColor": { + "$type": "color", + "$value": "{color.text.disabled}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["TEXT_FILL"], + "codeSyntax": {} + } } - } - }, - "iconColor": { - "$type": "color", - "$value": "{color.icon.disabled}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"], - "codeSyntax": {} + }, + "iconColor": { + "$type": "color", + "$value": "{color.icon.disabled}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"], + "codeSyntax": {} + } } - } - }, - "fontWeight": { - "$type": "number", - "$value": "{button.primary.enabled.fontWeight}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FONT_STYLE"], - "codeSyntax": {} + }, + "fontWeight": { + "$type": "number", + "$value": "{button.primary.rest.fontWeight}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FONT_STYLE"], + "codeSyntax": {} + } } } } @@ -172,7 +174,7 @@ }, "borderColor": { "$type": "color", - "$value": "{button.primary.enabled.borderColor}", + "$value": "{button.primary.rest.borderColor}", "$description": "", "$extensions": { "com.figma": { @@ -208,7 +210,7 @@ }, "fontWeight": { "$type": "number", - "$value": "{button.primary.enabled.fontWeight}", + "$value": "{button.primary.rest.fontWeight}", "$description": "", "$extensions": { "com.figma": { @@ -220,10 +222,10 @@ } }, "selected": { - "enabled": { + "rest": { "background": { "$type": "color", - "$value": "{button.default.selected.enabled.background}", + "$value": "{button.default.selected.rest.background}", "$description": "", "$extensions": { "com.figma": { @@ -235,7 +237,7 @@ }, "borderColor": { "$type": "color", - "$value": "{button.default.selected.enabled.borderColor}", + "$value": "{button.default.selected.rest.borderColor}", "$description": "", "$extensions": { "com.figma": { @@ -247,7 +249,7 @@ }, "textColor": { "$type": "color", - "$value": "{button.default.selected.enabled.textColor}", + "$value": "{button.default.selected.rest.textColor}", "$description": "", "$extensions": { "com.figma": { @@ -259,7 +261,7 @@ }, "iconColor": { "$type": "color", - "$value": "{button.default.selected.enabled.iconColor}", + "$value": "{button.default.selected.rest.iconColor}", "$description": "", "$extensions": { "com.figma": { @@ -271,7 +273,7 @@ }, "fontWeight": { "$type": "number", - "$value": "{button.primary.enabled.fontWeight}", + "$value": "{button.primary.rest.fontWeight}", "$description": "", "$extensions": { "com.figma": { @@ -285,7 +287,7 @@ "hover": { "background": { "$type": "color", - "$value": "{button.default.selected.enabled.background}", + "$value": "{button.default.selected.rest.background}", "$description": "", "$extensions": { "com.figma": { @@ -297,7 +299,7 @@ }, "borderColor": { "$type": "color", - "$value": "{button.default.selected.enabled.borderColor}", + "$value": "{button.default.selected.rest.borderColor}", "$description": "", "$extensions": { "com.figma": { @@ -309,7 +311,7 @@ }, "textColor": { "$type": "color", - "$value": "{button.default.selected.enabled.textColor}", + "$value": "{button.default.selected.rest.textColor}", "$description": "", "$extensions": { "com.figma": { @@ -321,7 +323,7 @@ }, "iconColor": { "$type": "color", - "$value": "{button.default.selected.enabled.iconColor}", + "$value": "{button.default.selected.rest.iconColor}", "$description": "", "$extensions": { "com.figma": { @@ -333,7 +335,7 @@ }, "fontWeight": { "$type": "number", - "$value": "{button.primary.enabled.fontWeight}", + "$value": "{button.primary.rest.fontWeight}", "$description": "", "$extensions": { "com.figma": { @@ -1387,10 +1389,10 @@ } }, "secondary": { - "enabled": { + "rest": { "background": { "$type": "color", - "$value": "{button.default.enabled.background}", + "$value": "{button.default.rest.background}", "$description": "", "$extensions": { "com.figma": { @@ -1414,7 +1416,7 @@ }, "textColor": { "$type": "color", - "$value": "{button.default.enabled.textColor}", + "$value": "{button.default.rest.textColor}", "$description": "", "$extensions": { "com.figma": { @@ -1426,7 +1428,7 @@ }, "iconColor": { "$type": "color", - "$value": "{button.default.enabled.iconColor}", + "$value": "{button.default.rest.iconColor}", "$description": "", "$extensions": { "com.figma": { @@ -1438,7 +1440,7 @@ }, "fontWeight": { "$type": "number", - "$value": "{button.default.enabled.fontWeight}", + "$value": "{button.default.rest.fontWeight}", "$description": "", "$extensions": { "com.figma": { @@ -1452,7 +1454,7 @@ "hover": { "background": { "$type": "color", - "$value": "{button.default.enabled.background}", + "$value": "{button.default.rest.background}", "$description": "", "$extensions": { "com.figma": { @@ -1476,7 +1478,7 @@ }, "textColor": { "$type": "color", - "$value": "{button.default.enabled.textColor}", + "$value": "{button.default.rest.textColor}", "$description": "", "$extensions": { "com.figma": { @@ -1488,7 +1490,7 @@ }, "iconColor": { "$type": "color", - "$value": "{button.default.enabled.iconColor}", + "$value": "{button.default.rest.iconColor}", "$description": "", "$extensions": { "com.figma": { @@ -1500,7 +1502,7 @@ }, "fontWeight": { "$type": "number", - "$value": "{button.default.enabled.fontWeight}", + "$value": "{button.default.rest.fontWeight}", "$description": "", "$extensions": { "com.figma": { @@ -1512,72 +1514,74 @@ } }, "disabled": { - "background": { - "$type": "color", - "$value": "{color.background.disabled}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL"], - "codeSyntax": {} + "rest": { + "background": { + "$type": "color", + "$value": "{color.background.disabled}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL"], + "codeSyntax": {} + } } - } - }, - "borderColor": { - "$type": "color", - "$value": "{color.border.disabled}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["STROKE_COLOR", "EFFECT_COLOR"], - "codeSyntax": {} + }, + "borderColor": { + "$type": "color", + "$value": "{color.border.disabled}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["STROKE_COLOR", "EFFECT_COLOR"], + "codeSyntax": {} + } } - } - }, - "textColor": { - "$type": "color", - "$value": "{color.text.disabled}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["TEXT_FILL"], - "codeSyntax": {} + }, + "textColor": { + "$type": "color", + "$value": "{color.text.disabled}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["TEXT_FILL"], + "codeSyntax": {} + } } - } - }, - "iconColor": { - "$type": "color", - "$value": "{color.icon.disabled}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"], - "codeSyntax": {} + }, + "iconColor": { + "$type": "color", + "$value": "{color.icon.disabled}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"], + "codeSyntax": {} + } } - } - }, - "fontWeight": { - "$type": "number", - "$value": "{button.default.enabled.fontWeight}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FONT_STYLE"], - "codeSyntax": {} + }, + "fontWeight": { + "$type": "number", + "$value": "{button.default.rest.fontWeight}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FONT_STYLE"], + "codeSyntax": {} + } } } } }, "selected": { - "enabled": { + "rest": { "background": { "$type": "color", - "$value": "{button.default.selected.enabled.background}", + "$value": "{button.default.selected.rest.background}", "$description": "", "$extensions": { "com.figma": { @@ -1589,7 +1593,7 @@ }, "borderColor": { "$type": "color", - "$value": "{button.default.selected.enabled.borderColor}", + "$value": "{button.default.selected.rest.borderColor}", "$description": "", "$extensions": { "com.figma": { @@ -1601,7 +1605,7 @@ }, "textColor": { "$type": "color", - "$value": "{button.default.selected.enabled.textColor}", + "$value": "{button.default.selected.rest.textColor}", "$description": "", "$extensions": { "com.figma": { @@ -1613,7 +1617,7 @@ }, "iconColor": { "$type": "color", - "$value": "{button.default.selected.enabled.iconColor}", + "$value": "{button.default.selected.rest.iconColor}", "$description": "", "$extensions": { "com.figma": { @@ -1625,7 +1629,7 @@ }, "fontWeight": { "$type": "number", - "$value": "{button.default.enabled.fontWeight}", + "$value": "{button.default.rest.fontWeight}", "$description": "", "$extensions": { "com.figma": { @@ -1639,7 +1643,7 @@ "hover": { "background": { "$type": "color", - "$value": "{button.default.selected.enabled.background}", + "$value": "{button.default.selected.rest.background}", "$description": "", "$extensions": { "com.figma": { @@ -1651,7 +1655,7 @@ }, "borderColor": { "$type": "color", - "$value": "{button.default.selected.enabled.borderColor}", + "$value": "{button.default.selected.rest.borderColor}", "$description": "", "$extensions": { "com.figma": { @@ -1663,7 +1667,7 @@ }, "textColor": { "$type": "color", - "$value": "{button.default.selected.enabled.textColor}", + "$value": "{button.default.selected.rest.textColor}", "$description": "", "$extensions": { "com.figma": { @@ -1675,7 +1679,7 @@ }, "iconColor": { "$type": "color", - "$value": "{button.default.selected.enabled.iconColor}", + "$value": "{button.default.selected.rest.iconColor}", "$description": "", "$extensions": { "com.figma": { @@ -1687,7 +1691,7 @@ }, "fontWeight": { "$type": "number", - "$value": "{button.default.enabled.fontWeight}", + "$value": "{button.default.rest.fontWeight}", "$description": "", "$extensions": { "com.figma": { @@ -2856,7 +2860,7 @@ } }, "default": { - "enabled": { + "rest": { "background": { "$type": "color", "$value": "{color.transparent}", @@ -2919,63 +2923,65 @@ } }, "disabled": { - "background": { - "$type": "color", - "$value": "{button.default.enabled.background}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL"], - "codeSyntax": {} - } - } - }, - "borderColor": { - "$type": "color", - "$value": "{button.default.enabled.borderColor}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["STROKE_COLOR"], - "codeSyntax": {} + "rest": { + "background": { + "$type": "color", + "$value": "{button.default.rest.background}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL"], + "codeSyntax": {} + } } - } - }, - "textColor": { - "$type": "color", - "$value": "{color.text.disabled}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["TEXT_FILL"], - "codeSyntax": {} + }, + "borderColor": { + "$type": "color", + "$value": "{button.default.rest.borderColor}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["STROKE_COLOR"], + "codeSyntax": {} + } } - } - }, - "iconColor": { - "$type": "color", - "$value": "{color.icon.disabled}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"], - "codeSyntax": {} + }, + "textColor": { + "$type": "color", + "$value": "{color.text.disabled}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["TEXT_FILL"], + "codeSyntax": {} + } } - } - }, - "fontWeight": { - "$type": "number", - "$value": "{button.default.enabled.fontWeight}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FONT_STYLE"], - "codeSyntax": {} + }, + "iconColor": { + "$type": "color", + "$value": "{color.icon.disabled}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"], + "codeSyntax": {} + } + } + }, + "fontWeight": { + "$type": "number", + "$value": "{button.default.rest.fontWeight}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FONT_STYLE"], + "codeSyntax": {} + } } } } @@ -2995,7 +3001,7 @@ }, "borderColor": { "$type": "color", - "$value": "{button.default.enabled.borderColor}", + "$value": "{button.default.rest.borderColor}", "$description": "", "$extensions": { "com.figma": { @@ -3007,7 +3013,7 @@ }, "textColor": { "$type": "color", - "$value": "{button.default.enabled.textColor}", + "$value": "{button.default.rest.textColor}", "$description": "", "$extensions": { "com.figma": { @@ -3019,7 +3025,7 @@ }, "iconColor": { "$type": "color", - "$value": "{button.default.enabled.iconColor}", + "$value": "{button.default.rest.iconColor}", "$description": "", "$extensions": { "com.figma": { @@ -3031,7 +3037,7 @@ }, "fontWeight": { "$type": "number", - "$value": "{button.default.enabled.fontWeight}", + "$value": "{button.default.rest.fontWeight}", "$description": "", "$extensions": { "com.figma": { @@ -3043,7 +3049,7 @@ } }, "selected": { - "enabled": { + "rest": { "background": { "$type": "color", "$value": "{color.background.active}", @@ -3070,7 +3076,7 @@ }, "textColor": { "$type": "color", - "$value": "{button.default.enabled.textColor}", + "$value": "{button.default.rest.textColor}", "$description": "", "$extensions": { "com.figma": { @@ -3082,7 +3088,7 @@ }, "iconColor": { "$type": "color", - "$value": "{button.default.enabled.iconColor}", + "$value": "{button.default.rest.iconColor}", "$description": "", "$extensions": { "com.figma": { @@ -3094,7 +3100,7 @@ }, "fontWeight": { "$type": "number", - "$value": "{button.default.enabled.fontWeight}", + "$value": "{button.default.rest.fontWeight}", "$description": "", "$extensions": { "com.figma": { @@ -3132,7 +3138,7 @@ }, "textColor": { "$type": "color", - "$value": "{button.default.enabled.textColor}", + "$value": "{button.default.rest.textColor}", "$description": "", "$extensions": { "com.figma": { @@ -3144,7 +3150,7 @@ }, "iconColor": { "$type": "color", - "$value": "{button.default.enabled.iconColor}", + "$value": "{button.default.rest.iconColor}", "$description": "", "$extensions": { "com.figma": { @@ -3156,7 +3162,7 @@ }, "fontWeight": { "$type": "number", - "$value": "{button.default.enabled.fontWeight}", + "$value": "{button.default.rest.fontWeight}", "$description": "", "$extensions": { "com.figma": { @@ -4210,7 +4216,7 @@ } }, "toolbar": { - "enabled": { + "rest": { "background": { "$type": "color", "$value": "{color.transparent}", @@ -4237,7 +4243,7 @@ }, "textColor": { "$type": "color", - "$value": "{button.default.enabled.textColor}", + "$value": "{button.default.rest.textColor}", "$description": "", "$extensions": { "com.figma": { @@ -4249,7 +4255,7 @@ }, "iconColor": { "$type": "color", - "$value": "{button.default.enabled.iconColor}", + "$value": "{button.default.rest.iconColor}", "$description": "", "$extensions": { "com.figma": { @@ -4261,7 +4267,7 @@ }, "fontWeight": { "$type": "number", - "$value": "{button.default.enabled.fontWeight}", + "$value": "{button.default.rest.fontWeight}", "$description": "", "$extensions": { "com.figma": { @@ -4272,10 +4278,10 @@ } } }, - "disabled": { + "hover": { "background": { "$type": "color", - "$value": "{color.background.disabled}", + "$value": "{color.background.hover}", "$description": "", "$extensions": { "com.figma": { @@ -4287,7 +4293,7 @@ }, "borderColor": { "$type": "color", - "$value": "{color.border.disabled}", + "$value": "{button.toolbar.rest.borderColor}", "$description": "", "$extensions": { "com.figma": { @@ -4299,7 +4305,7 @@ }, "textColor": { "$type": "color", - "$value": "{color.text.disabled}", + "$value": "{button.toolbar.rest.textColor}", "$description": "", "$extensions": { "com.figma": { @@ -4311,7 +4317,7 @@ }, "iconColor": { "$type": "color", - "$value": "{color.icon.disabled}", + "$value": "{button.toolbar.rest.iconColor}", "$description": "", "$extensions": { "com.figma": { @@ -4323,7 +4329,7 @@ }, "fontWeight": { "$type": "number", - "$value": "{button.default.enabled.fontWeight}", + "$value": "{button.default.rest.fontWeight}", "$description": "", "$extensions": { "com.figma": { @@ -4334,73 +4340,75 @@ } } }, - "hover": { - "background": { - "$type": "color", - "$value": "{color.background.hover}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL"], - "codeSyntax": {} + "disabled": { + "rest": { + "background": { + "$type": "color", + "$value": "{color.background.disabled}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL"], + "codeSyntax": {} + } } - } - }, - "borderColor": { - "$type": "color", - "$value": "{button.toolbar.enabled.borderColor}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["STROKE_COLOR", "EFFECT_COLOR"], - "codeSyntax": {} + }, + "borderColor": { + "$type": "color", + "$value": "{color.border.disabled}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["STROKE_COLOR", "EFFECT_COLOR"], + "codeSyntax": {} + } } - } - }, - "textColor": { - "$type": "color", - "$value": "{button.toolbar.enabled.textColor}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["TEXT_FILL"], - "codeSyntax": {} + }, + "textColor": { + "$type": "color", + "$value": "{color.text.disabled}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["TEXT_FILL"], + "codeSyntax": {} + } } - } - }, - "iconColor": { - "$type": "color", - "$value": "{button.toolbar.enabled.iconColor}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"], - "codeSyntax": {} + }, + "iconColor": { + "$type": "color", + "$value": "{color.icon.disabled}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"], + "codeSyntax": {} + } } - } - }, - "fontWeight": { - "$type": "number", - "$value": "{button.default.enabled.fontWeight}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FONT_STYLE"], - "codeSyntax": {} + }, + "fontWeight": { + "$type": "number", + "$value": "{button.default.rest.fontWeight}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FONT_STYLE"], + "codeSyntax": {} + } } } } }, "selected": { - "enabled": { + "rest": { "background": { "$type": "color", - "$value": "{button.default.selected.enabled.background}", + "$value": "{button.default.selected.rest.background}", "$description": "", "$extensions": { "com.figma": { @@ -4412,7 +4420,7 @@ }, "borderColor": { "$type": "color", - "$value": "{button.default.selected.enabled.borderColor}", + "$value": "{button.default.selected.rest.borderColor}", "$description": "", "$extensions": { "com.figma": { @@ -4424,7 +4432,7 @@ }, "textColor": { "$type": "color", - "$value": "{button.default.selected.enabled.textColor}", + "$value": "{button.default.selected.rest.textColor}", "$description": "", "$extensions": { "com.figma": { @@ -4436,7 +4444,7 @@ }, "iconColor": { "$type": "color", - "$value": "{button.default.selected.enabled.iconColor}", + "$value": "{button.default.selected.rest.iconColor}", "$description": "", "$extensions": { "com.figma": { @@ -4448,7 +4456,7 @@ }, "fontWeight": { "$type": "number", - "$value": "{button.default.enabled.fontWeight}", + "$value": "{button.default.rest.fontWeight}", "$description": "", "$extensions": { "com.figma": { @@ -4462,7 +4470,7 @@ "hover": { "background": { "$type": "color", - "$value": "{button.default.selected.enabled.background}", + "$value": "{button.default.selected.rest.background}", "$description": "", "$extensions": { "com.figma": { @@ -4474,7 +4482,7 @@ }, "borderColor": { "$type": "color", - "$value": "{button.default.selected.enabled.borderColor}", + "$value": "{button.default.selected.rest.borderColor}", "$description": "", "$extensions": { "com.figma": { @@ -4486,7 +4494,7 @@ }, "textColor": { "$type": "color", - "$value": "{button.default.selected.enabled.textColor}", + "$value": "{button.default.selected.rest.textColor}", "$description": "", "$extensions": { "com.figma": { @@ -4498,7 +4506,7 @@ }, "iconColor": { "$type": "color", - "$value": "{button.default.selected.enabled.iconColor}", + "$value": "{button.default.selected.rest.iconColor}", "$description": "", "$extensions": { "com.figma": { @@ -4510,7 +4518,7 @@ }, "fontWeight": { "$type": "number", - "$value": "{button.default.enabled.fontWeight}", + "$value": "{button.default.rest.fontWeight}", "$description": "", "$extensions": { "com.figma": { @@ -5616,7 +5624,7 @@ }, "menu": { "item": { - "enabled": { + "rest": { "background": { "$type": "color", "$value": "{color.transparent}", @@ -5643,7 +5651,7 @@ }, "textColor": { "$type": "color", - "$value": "{button.default.enabled.textColor}", + "$value": "{button.default.rest.textColor}", "$description": "", "$extensions": { "com.figma": { @@ -5655,7 +5663,7 @@ }, "iconColor": { "$type": "color", - "$value": "{button.default.enabled.iconColor}", + "$value": "{button.default.rest.iconColor}", "$description": "", "$extensions": { "com.figma": { @@ -5667,7 +5675,7 @@ }, "fontWeight": { "$type": "number", - "$value": "{button.default.enabled.fontWeight}", + "$value": "{button.default.rest.fontWeight}", "$description": "", "$extensions": { "com.figma": { @@ -5741,106 +5749,108 @@ } }, "disabled": { + "rest": { + "background": { + "$type": "color", + "$value": "{color.transparent}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL"], + "codeSyntax": {} + } + } + }, + "borderColor": { + "$type": "color", + "$value": "{color.transparent}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["STROKE_COLOR", "EFFECT_COLOR"], + "codeSyntax": {} + } + } + }, + "textColor": { + "$type": "color", + "$value": "{button.default.disabled.rest.textColor}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["TEXT_FILL"], + "codeSyntax": {} + } + } + }, + "iconColor": { + "$type": "color", + "$value": "{button.default.disabled.rest.iconColor}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["SHAPE_FILL", "STROKE_COLOR"], + "codeSyntax": {} + } + } + }, + "fontWeight": { + "$type": "number", + "$value": "{button.default.disabled.rest.fontWeight}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FONT_STYLE"], + "codeSyntax": {} + } + } + } + } + } + }, + "group": { + "separator": { "background": { "$type": "color", - "$value": "{color.transparent}", + "$value": "{color.border.default}", "$description": "", "$extensions": { "com.figma": { "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL"], + "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"], "codeSyntax": {} } } - }, - "borderColor": { - "$type": "color", - "$value": "{color.transparent}", + } + } + }, + "medium": { + "item": { + "paddingX": { + "$type": "number", + "$value": "{button.default.medium.paddingX}", "$description": "", "$extensions": { "com.figma": { "hiddenFromPublishing": false, - "scopes": ["STROKE_COLOR", "EFFECT_COLOR"], + "scopes": ["GAP"], "codeSyntax": {} } } }, - "textColor": { - "$type": "color", - "$value": "{button.default.disabled.textColor}", + "paddingY": { + "$type": "number", + "$value": "{button.default.medium.paddingY}", "$description": "", "$extensions": { "com.figma": { "hiddenFromPublishing": false, - "scopes": ["TEXT_FILL"], - "codeSyntax": {} - } - } - }, - "iconColor": { - "$type": "color", - "$value": "{button.default.disabled.iconColor}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["SHAPE_FILL", "STROKE_COLOR"], - "codeSyntax": {} - } - } - }, - "fontWeight": { - "$type": "number", - "$value": "{button.default.disabled.fontWeight}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FONT_STYLE"], - "codeSyntax": {} - } - } - } - } - }, - "group": { - "separator": { - "background": { - "$type": "color", - "$value": "{color.border.default}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"], - "codeSyntax": {} - } - } - } - } - }, - "medium": { - "item": { - "paddingX": { - "$type": "number", - "$value": "{button.default.medium.paddingX}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["GAP"], - "codeSyntax": {} - } - } - }, - "paddingY": { - "$type": "number", - "$value": "{button.default.medium.paddingY}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["GAP"], + "scopes": ["GAP"], "codeSyntax": {} } } @@ -6040,7 +6050,7 @@ } }, "option": { - "enabled": { + "rest": { "background": { "$type": "color", "$value": "{color.transparent}", @@ -6129,7 +6139,7 @@ }, "fontWeight": { "$type": "number", - "$value": "{select.option.enabled.fontWeight}", + "$value": "{select.option.rest.fontWeight}", "$description": "", "$extensions": { "com.figma": { @@ -6141,57 +6151,59 @@ } }, "disabled": { - "background": { - "$type": "color", - "$value": "{color.background.disabled}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL"], - "codeSyntax": {} + "rest": { + "background": { + "$type": "color", + "$value": "{color.background.disabled}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL"], + "codeSyntax": {} + } } - } - }, - "borderColor": { - "$type": "color", - "$value": "{color.transparent}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["STROKE_COLOR", "EFFECT_COLOR"], - "codeSyntax": {} + }, + "borderColor": { + "$type": "color", + "$value": "{color.transparent}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["STROKE_COLOR", "EFFECT_COLOR"], + "codeSyntax": {} + } } - } - }, - "textColor": { - "$type": "color", - "$value": "{color.text.disabled}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["TEXT_FILL"], - "codeSyntax": {} + }, + "textColor": { + "$type": "color", + "$value": "{color.text.disabled}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["TEXT_FILL"], + "codeSyntax": {} + } } - } - }, - "fontWeight": { - "$type": "number", - "$value": "{select.option.enabled.fontWeight}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FONT_STYLE"], - "codeSyntax": {} + }, + "fontWeight": { + "$type": "number", + "$value": "{select.option.rest.fontWeight}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FONT_STYLE"], + "codeSyntax": {} + } } } } }, "selected": { - "enabled": { + "rest": { "background": { "$type": "color", "$value": "{color.background.selected.weak.enabled}", @@ -6240,13 +6252,63 @@ } } } + }, + "hover": { + "background": { + "$type": "color", + "$value": "{color.background.selected.weak.hover}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL"], + "codeSyntax": {} + } + } + }, + "borderColor": { + "$type": "color", + "$value": "{color.transparent}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["STROKE_COLOR", "EFFECT_COLOR"], + "codeSyntax": {} + } + } + }, + "textColor": { + "$type": "color", + "$value": "{color.text.onSelected}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["TEXT_FILL"], + "codeSyntax": {} + } + } + }, + "fontWeight": { + "$type": "number", + "$value": "{fontWeight.medium}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FONT_STYLE"], + "codeSyntax": {} + } + } + } } } } }, "checkbox": { "control": { - "enabled": { + "rest": { "background": { "$type": "color", "$value": "{color.background.default}", @@ -6299,36 +6361,10 @@ } }, "disabled": { - "background": { - "$type": "color", - "$value": "{color.background.disabled}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL"], - "codeSyntax": {} - } - } - }, - "borderColor": { - "$type": "color", - "$value": "{color.border.disabled}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["STROKE_COLOR", "EFFECT_COLOR"], - "codeSyntax": {} - } - } - } - }, - "selected": { - "enabled": { + "rest": { "background": { "$type": "color", - "$value": "{color.background.selected.strong.enabled}", + "$value": "{color.background.disabled}", "$description": "", "$extensions": { "com.figma": { @@ -6340,7 +6376,7 @@ }, "borderColor": { "$type": "color", - "$value": "{color.border.selected}", + "$value": "{color.border.disabled}", "$description": "", "$extensions": { "com.figma": { @@ -6352,18 +6388,20 @@ }, "iconColor": { "$type": "color", - "$value": "{color.icon.onSelectedStrong}", + "$value": "{color.icon.disabled}", "$description": "", "$extensions": { "com.figma": { "hiddenFromPublishing": false, - "scopes": ["SHAPE_FILL", "STROKE_COLOR"], + "scopes": ["STROKE_COLOR", "EFFECT_COLOR"], "codeSyntax": {} } } } - }, - "hover": { + } + }, + "selected": { + "rest": { "background": { "$type": "color", "$value": "{color.background.selected.strong.enabled}", @@ -6378,7 +6416,7 @@ }, "borderColor": { "$type": "color", - "$value": "{color.border.strong}", + "$value": "{color.border.selected}", "$description": "", "$extensions": { "com.figma": { @@ -6401,10 +6439,10 @@ } } }, - "disabled": { + "hover": { "background": { "$type": "color", - "$value": "{color.background.disabled}", + "$value": "{color.background.selected.strong.enabled}", "$description": "", "$extensions": { "com.figma": { @@ -6416,7 +6454,7 @@ }, "borderColor": { "$type": "color", - "$value": "{color.border.disabled}", + "$value": "{color.border.strong}", "$description": "", "$extensions": { "com.figma": { @@ -6428,7 +6466,7 @@ }, "iconColor": { "$type": "color", - "$value": "{color.icon.disabled}", + "$value": "{color.icon.onSelectedStrong}", "$description": "", "$extensions": { "com.figma": { @@ -6441,7 +6479,7 @@ } }, "indeterminate": { - "enabled": { + "rest": { "background": { "$type": "color", "$value": "{color.background.selected.strong.enabled}", @@ -6516,49 +6554,11 @@ } } } - }, - "disabled": { - "background": { - "$type": "color", - "$value": "{color.background.disabled}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL"], - "codeSyntax": {} - } - } - }, - "borderColor": { - "$type": "color", - "$value": "{color.border.disabled}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["STROKE_COLOR", "EFFECT_COLOR"], - "codeSyntax": {} - } - } - }, - "iconColor": { - "$type": "color", - "$value": "{color.icon.disabled}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["SHAPE_FILL", "STROKE_COLOR"], - "codeSyntax": {} - } - } - } } } }, "label": { - "enabled": { + "rest": { "textColor": { "$type": "color", "$value": "{color.text.default}", @@ -6587,15 +6587,17 @@ } }, "disabled": { - "textColor": { - "$type": "color", - "$value": "{color.text.disabled}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["TEXT_FILL"], - "codeSyntax": {} + "rest": { + "textColor": { + "$type": "color", + "$value": "{color.text.disabled}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["TEXT_FILL"], + "codeSyntax": {} + } } } } @@ -6707,7 +6709,7 @@ "switch": { "control": { "track": { - "enabled": { + "rest": { "background": { "$type": "color", "$value": "{color.background.default}", @@ -6760,36 +6762,10 @@ } }, "disabled": { - "background": { - "$type": "color", - "$value": "{color.background.disabled}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL"], - "codeSyntax": {} - } - } - }, - "borderColor": { - "$type": "color", - "$value": "{color.border.disabled}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["STROKE_COLOR", "EFFECT_COLOR"], - "codeSyntax": {} - } - } - } - }, - "selected": { - "enabled": { + "rest": { "background": { "$type": "color", - "$value": "{color.background.selected.strong.enabled}", + "$value": "{color.background.disabled}", "$description": "", "$extensions": { "com.figma": { @@ -6801,7 +6777,7 @@ }, "borderColor": { "$type": "color", - "$value": "{color.border.default}", + "$value": "{color.border.disabled}", "$description": "", "$extensions": { "com.figma": { @@ -6811,8 +6787,10 @@ } } } - }, - "hover": { + } + }, + "selected": { + "rest": { "background": { "$type": "color", "$value": "{color.background.selected.strong.enabled}", @@ -6827,7 +6805,7 @@ }, "borderColor": { "$type": "color", - "$value": "{color.border.strong}", + "$value": "{color.border.default}", "$description": "", "$extensions": { "com.figma": { @@ -6838,10 +6816,10 @@ } } }, - "disabled": { + "hover": { "background": { "$type": "color", - "$value": "{color.background.disabled}", + "$value": "{color.background.selected.strong.enabled}", "$description": "", "$extensions": { "com.figma": { @@ -6853,7 +6831,7 @@ }, "borderColor": { "$type": "color", - "$value": "{color.border.disabled}", + "$value": "{color.border.strong}", "$description": "", "$extensions": { "com.figma": { @@ -6867,7 +6845,7 @@ } }, "handle": { - "enabled": { + "rest": { "background": { "$type": "color", "$value": "{color.background.front}", @@ -6920,36 +6898,10 @@ } }, "disabled": { - "background": { - "$type": "color", - "$value": "{color.background.disabled}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL"], - "codeSyntax": {} - } - } - }, - "borderColor": { - "$type": "color", - "$value": "{color.border.disabled}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["STROKE_COLOR", "EFFECT_COLOR"], - "codeSyntax": {} - } - } - } - }, - "selected": { - "enabled": { + "rest": { "background": { "$type": "color", - "$value": "{color.background.default}", + "$value": "{color.background.disabled}", "$description": "", "$extensions": { "com.figma": { @@ -6961,7 +6913,7 @@ }, "borderColor": { "$type": "color", - "$value": "{color.border.default}", + "$value": "{color.border.disabled}", "$description": "", "$extensions": { "com.figma": { @@ -6971,8 +6923,10 @@ } } } - }, - "hover": { + } + }, + "selected": { + "rest": { "background": { "$type": "color", "$value": "{color.background.default}", @@ -6998,10 +6952,10 @@ } } }, - "disabled": { + "hover": { "background": { "$type": "color", - "$value": "{color.background.disabled}", + "$value": "{color.background.default}", "$description": "", "$extensions": { "com.figma": { @@ -7013,7 +6967,7 @@ }, "borderColor": { "$type": "color", - "$value": "{color.border.disabled}", + "$value": "{color.border.default}", "$description": "", "$extensions": { "com.figma": { @@ -7028,7 +6982,7 @@ } }, "label": { - "enabled": { + "rest": { "textColor": { "$type": "color", "$value": "{color.text.default}", @@ -7057,15 +7011,17 @@ } }, "disabled": { - "textColor": { - "$type": "color", - "$value": "{color.text.disabled}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["TEXT_FILL"], - "codeSyntax": {} + "rest": { + "textColor": { + "$type": "color", + "$value": "{color.text.disabled}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["TEXT_FILL"], + "codeSyntax": {} + } } } } @@ -7323,7 +7279,7 @@ } } }, - "enabled": { + "rest": { "textColor": { "$type": "color", "$value": "{color.text.default}", @@ -7376,7 +7332,7 @@ "hover": { "textColor": { "$type": "color", - "$value": "{dataCell.enabled.textColor}", + "$value": "{dataCell.rest.textColor}", "$description": "", "$extensions": { "com.figma": { @@ -7388,7 +7344,7 @@ }, "iconColor": { "$type": "color", - "$value": "{dataCell.enabled.iconColor}", + "$value": "{dataCell.rest.iconColor}", "$description": "", "$extensions": { "com.figma": { @@ -7400,7 +7356,7 @@ }, "borderColor": { "$type": "color", - "$value": "{dataCell.enabled.borderColor}", + "$value": "{dataCell.rest.borderColor}", "$description": "", "$extensions": { "com.figma": { @@ -7424,113 +7380,155 @@ } }, "disabled": { - "textColor": { - "$type": "color", - "$value": "{color.text.disabled}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["TEXT_FILL"], - "codeSyntax": {} + "rest": { + "textColor": { + "$type": "color", + "$value": "{color.text.disabled}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["TEXT_FILL"], + "codeSyntax": {} + } } - } - }, - "iconColor": { - "$type": "color", - "$value": "{color.icon.disabled}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"], - "codeSyntax": {} + }, + "iconColor": { + "$type": "color", + "$value": "{color.icon.disabled}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"], + "codeSyntax": {} + } } - } - }, - "borderColor": { - "$type": "color", - "$value": "{dataCell.enabled.borderColor}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["STROKE_COLOR", "EFFECT_COLOR"], - "codeSyntax": {} + }, + "borderColor": { + "$type": "color", + "$value": "{dataCell.rest.borderColor}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["STROKE_COLOR", "EFFECT_COLOR"], + "codeSyntax": {} + } } - } - }, - "background": { - "$type": "color", - "$value": "{dataCell.enabled.background}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL"], - "codeSyntax": {} + }, + "background": { + "$type": "color", + "$value": "{dataCell.rest.background}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL"], + "codeSyntax": {} + } } } } }, - "pinned": { - "textColor": { - "$type": "color", - "$value": "{dataCell.enabled.textColor}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["TEXT_FILL"], - "codeSyntax": {} + "selected": { + "rest": { + "textColor": { + "$type": "color", + "$value": "{color.text.onSelected}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["TEXT_FILL"], + "codeSyntax": {} + } } - } - }, - "iconColor": { - "$type": "color", - "$value": "{dataCell.enabled.iconColor}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"], - "codeSyntax": {} + }, + "iconColor": { + "$type": "color", + "$value": "{color.icon.onSelected}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"], + "codeSyntax": {} + } } - } - }, - "borderColor": { - "$type": "color", - "$value": "{dataCell.enabled.borderColor}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["STROKE_COLOR", "EFFECT_COLOR"], - "codeSyntax": {} + }, + "borderColor": { + "$type": "color", + "$value": "{dataCell.rest.borderColor}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["STROKE_COLOR", "EFFECT_COLOR"], + "codeSyntax": {} + } } - } - }, - "backgroundColor": { - "$type": "color", - "$value": "{dataCell.enabled.background}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL"], - "codeSyntax": {} + }, + "background": { + "$type": "color", + "$value": "{color.background.selected.weak.enabled}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL"], + "codeSyntax": {} + } } } }, - "background": { - "$type": "color", - "$value": "{dataCell.enabled.background}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL"], - "codeSyntax": {} + "hover": { + "textColor": { + "$type": "color", + "$value": "{color.text.onSelected}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["TEXT_FILL"], + "codeSyntax": {} + } + } + }, + "iconColor": { + "$type": "color", + "$value": "{color.icon.onSelected}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"], + "codeSyntax": {} + } + } + }, + "borderColor": { + "$type": "color", + "$value": "{dataCell.rest.borderColor}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["STROKE_COLOR", "EFFECT_COLOR"], + "codeSyntax": {} + } + } + }, + "background": { + "$type": "color", + "$value": "{color.background.selected.weak.hover}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL"], + "codeSyntax": {} + } } } } @@ -7620,7 +7618,7 @@ } } }, - "enabled": { + "rest": { "textColor": { "$type": "color", "$value": "{color.text.strong}", @@ -7647,7 +7645,7 @@ }, "borderColor": { "$type": "color", - "$value": "{dataCell.enabled.borderColor}", + "$value": "{dataCell.rest.borderColor}", "$description": "", "$extensions": { "com.figma": { @@ -7659,7 +7657,7 @@ }, "background": { "$type": "color", - "$value": "{dataCell.enabled.background}", + "$value": "{dataCell.rest.background}", "$description": "", "$extensions": { "com.figma": { @@ -7673,7 +7671,7 @@ "hover": { "textColor": { "$type": "color", - "$value": "{dataCell.primary.enabled.textColor}", + "$value": "{dataCell.primary.rest.textColor}", "$description": "", "$extensions": { "com.figma": { @@ -7685,7 +7683,7 @@ }, "iconColor": { "$type": "color", - "$value": "{dataCell.primary.enabled.iconColor}", + "$value": "{dataCell.primary.rest.iconColor}", "$description": "", "$extensions": { "com.figma": { @@ -7723,7 +7721,59 @@ "disabled": { "textColor": { "$type": "color", - "$value": "{dataCell.disabled.textColor}", + "$value": "{dataCell.disabled.rest.textColor}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["TEXT_FILL"], + "codeSyntax": {} + } + } + }, + "iconColor": { + "$type": "color", + "$value": "{dataCell.disabled.rest.iconColor}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"], + "codeSyntax": {} + } + } + }, + "borderColor": { + "$type": "color", + "$value": "{dataCell.disabled.rest.borderColor}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["STROKE_COLOR", "EFFECT_COLOR"], + "codeSyntax": {} + } + } + }, + "background": { + "$type": "color", + "$value": "{dataCell.disabled.rest.background}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL"], + "codeSyntax": {} + } + } + } + } + }, + "pinned": { + "rest": { + "textColor": { + "$type": "color", + "$value": "{dataCell.rest.textColor}", "$description": "", "$extensions": { "com.figma": { @@ -7735,7 +7785,7 @@ }, "iconColor": { "$type": "color", - "$value": "{dataCell.disabled.iconColor}", + "$value": "{dataCell.rest.iconColor}", "$description": "", "$extensions": { "com.figma": { @@ -7747,7 +7797,7 @@ }, "borderColor": { "$type": "color", - "$value": "{dataCell.disabled.borderColor}", + "$value": "{dataCell.rest.borderColor}", "$description": "", "$extensions": { "com.figma": { @@ -7757,9 +7807,21 @@ } } }, + "backgroundColor": { + "$type": "color", + "$value": "{dataCell.rest.background}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL"], + "codeSyntax": {} + } + } + }, "background": { "$type": "color", - "$value": "{dataCell.disabled.background}", + "$value": "{dataCell.rest.background}", "$description": "", "$extensions": { "com.figma": { @@ -7770,10 +7832,10 @@ } } }, - "pinned": { + "hover": { "textColor": { "$type": "color", - "$value": "{dataCell.primary.enabled.textColor}", + "$value": "{dataCell.rest.textColor}", "$description": "", "$extensions": { "com.figma": { @@ -7785,7 +7847,7 @@ }, "iconColor": { "$type": "color", - "$value": "{dataCell.primary.enabled.iconColor}", + "$value": "{dataCell.rest.iconColor}", "$description": "", "$extensions": { "com.figma": { @@ -7797,7 +7859,7 @@ }, "borderColor": { "$type": "color", - "$value": "{dataCell.pinned.borderColor}", + "$value": "{dataCell.rest.borderColor}", "$description": "", "$extensions": { "com.figma": { @@ -7807,9 +7869,21 @@ } } }, + "backgroundColor": { + "$type": "color", + "$value": "{dataCell.rest.background}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL"], + "codeSyntax": {} + } + } + }, "background": { "$type": "color", - "$value": "{dataCell.pinned.background}", + "$value": "{dataCell.rest.background}", "$description": "", "$extensions": { "com.figma": { @@ -7907,7 +7981,7 @@ } } }, - "enabled": { + "rest": { "textColor": { "$type": "color", "$value": "{color.text.strong}", @@ -7960,7 +8034,7 @@ "hover": { "textColor": { "$type": "color", - "$value": "{headerCell.enabled.textColor}", + "$value": "{headerCell.rest.textColor}", "$description": "", "$extensions": { "com.figma": { @@ -7972,7 +8046,7 @@ }, "iconColor": { "$type": "color", - "$value": "{headerCell.enabled.iconColor}", + "$value": "{headerCell.rest.iconColor}", "$description": "", "$extensions": { "com.figma": { @@ -7984,7 +8058,7 @@ }, "borderColor": { "$type": "color", - "$value": "{headerCell.enabled.borderColor}", + "$value": "{headerCell.rest.borderColor}", "$description": "", "$extensions": { "com.figma": { @@ -8010,7 +8084,7 @@ "pinned": { "textColor": { "$type": "color", - "$value": "{dataCell.enabled.textColor}", + "$value": "{dataCell.rest.textColor}", "$description": "", "$extensions": { "com.figma": { @@ -8022,7 +8096,7 @@ }, "iconColor": { "$type": "color", - "$value": "{dataCell.enabled.iconColor}", + "$value": "{dataCell.rest.iconColor}", "$description": "", "$extensions": { "com.figma": { @@ -8082,7 +8156,7 @@ } }, "units": { - "enabled": { + "rest": { "textColor": { "$type": "color", "$value": "{color.text.weak}", @@ -8109,6 +8183,36 @@ } } } + }, + "pinned": { + "rest": { + "textColor": { + "$type": "color", + "$value": "{headerCell.units.rest.textColor}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["ALL_SCOPES"], + "codeSyntax": {} + } + } + } + }, + "hover": { + "textColor": { + "$type": "color", + "$value": "{headerCell.units.rest.textColor}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["ALL_SCOPES"], + "codeSyntax": {} + } + } + } + } } } }, @@ -8693,7 +8797,7 @@ }, "borderColor": { "$type": "color", - "$value": "#ffffff", + "$value": "{color.transparent}", "$description": "", "$extensions": { "com.figma": { @@ -8758,6 +8862,32 @@ } } }, + "focus": { + "background": { + "$type": "color", + "$value": "{color.background.hover}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL"], + "codeSyntax": {} + } + } + }, + "borderColor": { + "$type": "color", + "$value": "{color.transparent}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["STROKE_COLOR", "EFFECT_COLOR"], + "codeSyntax": {} + } + } + } + }, "readOnly": { "background": { "$type": "color", @@ -8842,7 +8972,7 @@ "hover": { "background": { "$type": "color", - "$value": "{color.transparent}", + "$value": "{color.background.hover}", "$description": "", "$extensions": { "com.figma": { @@ -9693,10 +9823,10 @@ } } }, - "enabled": { + "rest": { "textColor": { "$type": "color", - "$value": "{dataCell.enabled.textColor}", + "$value": "{dataCell.rest.textColor}", "$description": "", "$extensions": { "com.figma": { @@ -9708,7 +9838,7 @@ }, "iconColor": { "$type": "color", - "$value": "{dataCell.enabled.iconColor}", + "$value": "{dataCell.rest.iconColor}", "$description": "", "$extensions": { "com.figma": { @@ -9746,7 +9876,7 @@ "hover": { "textColor": { "$type": "color", - "$value": "{footerCell.enabled.textColor}", + "$value": "{footerCell.rest.textColor}", "$description": "", "$extensions": { "com.figma": { @@ -9758,7 +9888,7 @@ }, "iconColor": { "$type": "color", - "$value": "{footerCell.enabled.iconColor}", + "$value": "{footerCell.rest.iconColor}", "$description": "", "$extensions": { "com.figma": { @@ -9770,7 +9900,7 @@ }, "borderColor": { "$type": "color", - "$value": "{footerCell.enabled.borderColor}", + "$value": "{footerCell.rest.borderColor}", "$description": "", "$extensions": { "com.figma": { @@ -9794,59 +9924,43 @@ } }, "pinned": { - "textColor": { - "$type": "color", - "$value": "{dataCell.enabled.textColor}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["TEXT_FILL"], - "codeSyntax": {} - } - } - }, - "iconColor": { - "$type": "color", - "$value": "{dataCell.enabled.iconColor}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"], - "codeSyntax": {} + "rest": { + "textColor": { + "$type": "color", + "$value": "{dataCell.rest.textColor}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["TEXT_FILL"], + "codeSyntax": {} + } } - } - }, - "borderColor": { - "$type": "color", - "$value": "{dataCell.hover.borderColor}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["STROKE_COLOR", "EFFECT_COLOR"], - "codeSyntax": {} + }, + "iconColor": { + "$type": "color", + "$value": "{dataCell.rest.iconColor}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"], + "codeSyntax": {} + } } - } - }, - "background": { - "$type": "color", - "$value": "{color.transparent}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL"], - "codeSyntax": {} + }, + "borderColor": { + "$type": "color", + "$value": "{dataCell.hover.borderColor}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["STROKE_COLOR", "EFFECT_COLOR"], + "codeSyntax": {} + } } - } - } - } - }, - "radioButton": { - "control": { - "enabled": { + }, "background": { "$type": "color", "$value": "{color.transparent}", @@ -9858,10 +9972,36 @@ "codeSyntax": {} } } + } + }, + "hover": { + "textColor": { + "$type": "color", + "$value": "{dataCell.rest.textColor}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["TEXT_FILL"], + "codeSyntax": {} + } + } + }, + "iconColor": { + "$type": "color", + "$value": "{dataCell.rest.iconColor}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"], + "codeSyntax": {} + } + } }, "borderColor": { "$type": "color", - "$value": "{color.border.default}", + "$value": "{dataCell.hover.borderColor}", "$description": "", "$extensions": { "com.figma": { @@ -9870,9 +10010,25 @@ "codeSyntax": {} } } + }, + "background": { + "$type": "color", + "$value": "{color.transparent}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL"], + "codeSyntax": {} + } + } } - }, - "hover": { + } + } + }, + "radioButton": { + "control": { + "rest": { "background": { "$type": "color", "$value": "{color.transparent}", @@ -9887,7 +10043,7 @@ }, "borderColor": { "$type": "color", - "$value": "{color.border.strong}", + "$value": "{color.border.default}", "$description": "", "$extensions": { "com.figma": { @@ -9898,7 +10054,7 @@ } } }, - "focus": { + "hover": { "background": { "$type": "color", "$value": "{color.transparent}", @@ -9913,7 +10069,7 @@ }, "borderColor": { "$type": "color", - "$value": "{color.border.default}", + "$value": "{color.border.strong}", "$description": "", "$extensions": { "com.figma": { @@ -9924,10 +10080,10 @@ } } }, - "disabled": { + "focus": { "background": { "$type": "color", - "$value": "{color.background.disabled}", + "$value": "{color.transparent}", "$description": "", "$extensions": { "com.figma": { @@ -9939,7 +10095,7 @@ }, "borderColor": { "$type": "color", - "$value": "{color.border.disabled}", + "$value": "{color.border.default}", "$description": "", "$extensions": { "com.figma": { @@ -9950,11 +10106,11 @@ } } }, - "selected": { - "enabled": { + "disabled": { + "rest": { "background": { "$type": "color", - "$value": "{color.background.default}", + "$value": "{color.background.disabled}", "$description": "", "$extensions": { "com.figma": { @@ -9966,7 +10122,7 @@ }, "borderColor": { "$type": "color", - "$value": "{color.border.selected}", + "$value": "{color.border.disabled}", "$description": "", "$extensions": { "com.figma": { @@ -9975,21 +10131,11 @@ "codeSyntax": {} } } - }, - "iconColor": { - "$type": "color", - "$value": "{color.icon.brand}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["SHAPE_FILL", "STROKE_COLOR"], - "codeSyntax": {} - } - } } - }, - "hover": { + } + }, + "selected": { + "rest": { "background": { "$type": "color", "$value": "{color.background.default}", @@ -10004,7 +10150,7 @@ }, "borderColor": { "$type": "color", - "$value": "{color.border.strong}", + "$value": "{color.border.selected}", "$description": "", "$extensions": { "com.figma": { @@ -10016,7 +10162,7 @@ }, "iconColor": { "$type": "color", - "$value": "{color.icon.brand}", + "$value": "{color.decorative.brand}", "$description": "", "$extensions": { "com.figma": { @@ -10027,7 +10173,7 @@ } } }, - "focus": { + "hover": { "background": { "$type": "color", "$value": "{color.background.default}", @@ -10042,7 +10188,7 @@ }, "borderColor": { "$type": "color", - "$value": "{color.border.selected}", + "$value": "{color.border.strong}", "$description": "", "$extensions": { "com.figma": { @@ -10054,21 +10200,21 @@ }, "iconColor": { "$type": "color", - "$value": "{color.icon.brand}", + "$value": "{color.decorative.brand}", "$description": "", "$extensions": { "com.figma": { "hiddenFromPublishing": false, - "scopes": ["STROKE_COLOR", "EFFECT_COLOR"], + "scopes": ["SHAPE_FILL", "STROKE_COLOR"], "codeSyntax": {} } } } }, - "disabled": { + "focus": { "background": { "$type": "color", - "$value": "{color.background.disabled}", + "$value": "{color.background.default}", "$description": "", "$extensions": { "com.figma": { @@ -10080,7 +10226,7 @@ }, "borderColor": { "$type": "color", - "$value": "{color.border.disabled}", + "$value": "{color.border.selected}", "$description": "", "$extensions": { "com.figma": { @@ -10092,12 +10238,12 @@ }, "iconColor": { "$type": "color", - "$value": "{color.icon.disabled}", + "$value": "{color.decorative.brand}", "$description": "", "$extensions": { "com.figma": { "hiddenFromPublishing": false, - "scopes": ["SHAPE_FILL", "STROKE_COLOR"], + "scopes": ["STROKE_COLOR", "EFFECT_COLOR"], "codeSyntax": {} } } @@ -10106,7 +10252,7 @@ } }, "label": { - "enabled": { + "rest": { "textColor": { "$type": "color", "$value": "{color.text.default}", @@ -10135,15 +10281,47 @@ } }, "disabled": { - "textColor": { - "$type": "color", - "$value": "{color.text.disabled}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["TEXT_FILL"], - "codeSyntax": {} + "rest": { + "textColor": { + "$type": "color", + "$value": "{color.text.disabled}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["TEXT_FILL"], + "codeSyntax": {} + } + } + } + } + }, + "selected": { + "rest": { + "textColor": { + "$type": "color", + "$value": "{color.text.default}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["TEXT_FILL"], + "codeSyntax": {} + } + } + } + }, + "hover": { + "textColor": { + "$type": "color", + "$value": "{color.text.default}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["TEXT_FILL"], + "codeSyntax": {} + } } } } @@ -10254,7 +10432,7 @@ }, "anchor": { "default": { - "enabled": { + "rest": { "textColor": { "$type": "color", "$value": "{color.text.strong}", @@ -10367,10 +10545,8 @@ } } } - } - }, - "small": { - "default": { + }, + "small": { "fontSize": { "$type": "number", "$value": "{element.small.fontSize}", @@ -10407,10 +10583,8 @@ } } } - } - }, - "medium": { - "default": { + }, + "medium": { "fontSize": { "$type": "number", "$value": "{element.medium.fontSize}", @@ -10447,10 +10621,8 @@ } } } - } - }, - "large": { - "default": { + }, + "large": { "fontSize": { "$type": "number", "$value": "{element.large.fontSize}", @@ -10487,10 +10659,8 @@ } } } - } - }, - "xlarge": { - "default": { + }, + "xlarge": { "fontSize": { "$type": "number", "$value": "{element.xlarge.fontSize}", @@ -10527,10 +10697,8 @@ } } } - } - }, - "xxlarge": { - "default": { + }, + "xxlarge": { "fontSize": { "$type": "number", "$value": "{text.xxlarge.fontSize}", @@ -10567,10 +10735,8 @@ } } } - } - }, - "3xlarge": { - "default": { + }, + "3xlarge": { "fontSize": { "$type": "number", "$value": "{text.3xl.fontSize}", @@ -10607,10 +10773,8 @@ } } } - } - }, - "4xlarge": { - "default": { + }, + "4xlarge": { "fontSize": { "$type": "number", "$value": "{text.4xl.fontSize}", @@ -10647,10 +10811,8 @@ } } } - } - }, - "5xlarge": { - "default": { + }, + "5xlarge": { "fontSize": { "$type": "number", "$value": "{text.5xl.fontSize}", @@ -10687,10 +10849,8 @@ } } } - } - }, - "6xlarge": { - "default": { + }, + "6xlarge": { "fontSize": { "$type": "number", "$value": "{text.6xl.fontSize}", diff --git a/design-tokens/tokens/semantic/color.dark.json b/design-tokens/tokens/semantic/color.dark.json index 61aacbd8a..36aa5b037 100644 --- a/design-tokens/tokens/semantic/color.dark.json +++ b/design-tokens/tokens/semantic/color.dark.json @@ -109,9 +109,9 @@ } } }, - "critical": { + "warning": { "$type": "color", - "$value": "{base.color.red.800-Opacity30}", + "$value": "{base.color.yellow.400-Opacity12}", "$description": "", "$extensions": { "com.figma": { @@ -121,9 +121,21 @@ } } }, - "ok": { + "info": { "$type": "color", - "$value": "{base.color.green.500-Opacity30}", + "$value": "{base.color.blue.400-Opacity12}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL"], + "codeSyntax": {} + } + } + }, + "critical": { + "$type": "color", + "$value": "{base.color.red.800-Opacity30}", "$description": "", "$extensions": { "com.figma": { @@ -159,6 +171,30 @@ } } }, + "unknown": { + "$type": "color", + "$value": "{base.color.white.opacity6}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL"], + "codeSyntax": {} + } + } + }, + "ok": { + "$type": "color", + "$value": "{base.color.green.500-Opacity30}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL"], + "codeSyntax": {} + } + } + }, "selected": { "strong": { "enabled": { @@ -213,42 +249,6 @@ } } }, - "unknown": { - "$type": "color", - "$value": "{base.color.white.opacity6}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL"], - "codeSyntax": {} - } - } - }, - "warning": { - "$type": "color", - "$value": "{base.color.yellow.400-Opacity12}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL"], - "codeSyntax": {} - } - } - }, - "info": { - "$type": "color", - "$value": "{base.color.blue.400-Opacity12}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL"], - "codeSyntax": {} - } - } - }, "neutral": { "xstrong": { "$type": "color", @@ -406,7 +406,7 @@ "$extensions": { "com.figma": { "hiddenFromPublishing": false, - "scopes": ["TEXT_FILL"], + "scopes": ["SHAPE_FILL", "TEXT_FILL"], "codeSyntax": {} } } @@ -423,18 +423,6 @@ } } }, - "xweak": { - "$type": "color", - "$value": "{base.color.white.opacity20}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["TEXT_FILL"], - "codeSyntax": {} - } - } - }, "placeholder": { "$type": "color", "$value": "{color.text.weak}", @@ -471,15 +459,17 @@ } } }, - "brand": { - "$type": "color", - "$value": "{base.color.green.600}", - "$description": "Brand text color. Use with caution. Currently not accessible for text that is below a bold weight and below 19px.", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["TEXT_FILL"], - "codeSyntax": {} + "onStrong": { + "default": { + "$type": "color", + "$value": "{base.color.grey.1200}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["TEXT_FILL"], + "codeSyntax": {} + } } } }, @@ -509,20 +499,6 @@ } } }, - "onStrong": { - "default": { - "$type": "color", - "$value": "{base.color.grey.1200}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["TEXT_FILL"], - "codeSyntax": {} - } - } - } - }, "critical": { "$type": "color", "$value": "{color.text.default}", @@ -775,18 +751,6 @@ } } }, - "xweak": { - "$type": "color", - "$value": "{base.color.white.opacity20}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"], - "codeSyntax": {} - } - } - }, "disabled": { "$type": "color", "$value": "{base.color.white.opacity24}", @@ -883,18 +847,6 @@ } } }, - "brand": { - "$type": "color", - "$value": "{base.color.green.600}", - "$description": "Brand color for icons.", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"], - "codeSyntax": {} - } - } - }, "onSelectedStrong": { "$type": "color", "$value": "{base.color.white.100}", diff --git a/design-tokens/tokens/semantic/color.light.json b/design-tokens/tokens/semantic/color.light.json index 8a103a137..a24bba710 100644 --- a/design-tokens/tokens/semantic/color.light.json +++ b/design-tokens/tokens/semantic/color.light.json @@ -109,9 +109,9 @@ } } }, - "critical": { + "warning": { "$type": "color", - "$value": "{base.color.red.500-Opacity24}", + "$value": "{base.color.orange.400-Opacity24}", "$description": "", "$extensions": { "com.figma": { @@ -121,9 +121,21 @@ } } }, - "ok": { + "info": { "$type": "color", - "$value": "{base.color.green.400-Opacity24}", + "$value": "{base.color.blue.400-Opacity24}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL"], + "codeSyntax": {} + } + } + }, + "critical": { + "$type": "color", + "$value": "{base.color.red.500-Opacity24}", "$description": "", "$extensions": { "com.figma": { @@ -159,6 +171,30 @@ } } }, + "unknown": { + "$type": "color", + "$value": "{base.color.black.opacity4}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL"], + "codeSyntax": {} + } + } + }, + "ok": { + "$type": "color", + "$value": "{base.color.green.400-Opacity24}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["FRAME_FILL", "SHAPE_FILL"], + "codeSyntax": {} + } + } + }, "selected": { "strong": { "enabled": { @@ -213,42 +249,6 @@ } } }, - "unknown": { - "$type": "color", - "$value": "{base.color.black.opacity4}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL"], - "codeSyntax": {} - } - } - }, - "warning": { - "$type": "color", - "$value": "{base.color.orange.400-Opacity24}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL"], - "codeSyntax": {} - } - } - }, - "info": { - "$type": "color", - "$value": "{base.color.blue.400-Opacity24}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL"], - "codeSyntax": {} - } - } - }, "neutral": { "xstrong": { "$type": "color", @@ -406,7 +406,7 @@ "$extensions": { "com.figma": { "hiddenFromPublishing": false, - "scopes": ["TEXT_FILL"], + "scopes": ["SHAPE_FILL", "TEXT_FILL"], "codeSyntax": {} } } @@ -423,18 +423,6 @@ } } }, - "xweak": { - "$type": "color", - "$value": "{base.color.grey.500}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["TEXT_FILL"], - "codeSyntax": {} - } - } - }, "placeholder": { "$type": "color", "$value": "{color.text.weak}", @@ -471,15 +459,17 @@ } } }, - "brand": { - "$type": "color", - "$value": "{base.color.green.600}", - "$description": "Brand text color. Use with caution. Currently not accessible for text that is below a bold weight and below 19px.", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["TEXT_FILL"], - "codeSyntax": {} + "onStrong": { + "default": { + "$type": "color", + "$value": "{base.color.white.100}", + "$description": "", + "$extensions": { + "com.figma": { + "hiddenFromPublishing": false, + "scopes": ["TEXT_FILL"], + "codeSyntax": {} + } } } }, @@ -499,7 +489,7 @@ }, "primary": { "$type": "color", - "$value": "{base.color.green.600}", + "$value": "{base.color.green.800}", "$description": "", "$extensions": { "com.figma": { @@ -509,20 +499,6 @@ } } }, - "onStrong": { - "default": { - "$type": "color", - "$value": "{base.color.white.100}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["TEXT_FILL"], - "codeSyntax": {} - } - } - } - }, "critical": { "$type": "color", "$value": "{color.text.default}", @@ -775,18 +751,6 @@ } } }, - "xweak": { - "$type": "color", - "$value": "{base.color.grey.500}", - "$description": "", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"], - "codeSyntax": {} - } - } - }, "disabled": { "$type": "color", "$value": "{base.color.black.opacity24}", @@ -883,18 +847,6 @@ } } }, - "brand": { - "$type": "color", - "$value": "{base.color.green.600}", - "$description": "Brand color for icons.", - "$extensions": { - "com.figma": { - "hiddenFromPublishing": false, - "scopes": ["FRAME_FILL", "SHAPE_FILL", "STROKE_COLOR"], - "codeSyntax": {} - } - } - }, "onSelectedStrong": { "$type": "color", "$value": "{base.color.white.100}", diff --git a/sandbox/grommet-app/src/theme.jsx b/sandbox/grommet-app/src/theme.jsx index 61ab82838..5c1d02c97 100644 --- a/sandbox/grommet-app/src/theme.jsx +++ b/sandbox/grommet-app/src/theme.jsx @@ -8,26 +8,26 @@ import { global as localGlobal, components as localComponents, } from 'hpe-design-tokens'; -import { - dark as oldDark, - light as oldLight, - large as oldLarge, - small as oldSmall, - global as oldGlobal, - components as oldComponents, - elevationdark as oldElevationDark, - elevationlight as oldElevationLight, -} from 'hpe-design-tokens-old-theme'; -import { - dark as refreshDark, - light as refreshLight, - large as refreshLarge, - small as refreshSmall, - global as refreshGlobal, - components as refreshComponents, - elevationdark as refreshElevationDark, - elevationlight as refreshElevationLight, -} from 'hpe-design-tokens-brand-refresh'; +// import { +// dark as oldDark, +// light as oldLight, +// large as oldLarge, +// small as oldSmall, +// global as oldGlobal, +// components as oldComponents, +// elevationdark as oldElevationDark, +// elevationlight as oldElevationLight, +// } from 'hpe-design-tokens-old-theme'; +// import { +// dark as refreshDark, +// light as refreshLight, +// large as refreshLarge, +// small as refreshSmall, +// global as refreshGlobal, +// components as refreshComponents, +// elevationdark as refreshElevationDark, +// elevationlight as refreshElevationLight, +// } from 'hpe-design-tokens-brand-refresh'; import { Down, Blank, @@ -230,7 +230,7 @@ const buildTheme = tokens => { 'active-text': MISSING.color, 'disabled-text': MISSING.color, // deprecated, use text-weak instead - 'text-primary-button': components.hpe.button.primary.enabled.textColor, + 'text-primary-button': components.hpe.button.primary.rest.textColor, 'background-cta-alternate': MISSING.color, // ----------- These ones we need to map manually for backwards compatibility ----------- @@ -487,7 +487,7 @@ const buildTheme = tokens => { // option button kind styles. abstracted so select.emptySearchMessage // can reference pad value const option = { - color: components.hpe.select.option.enabled.textColor, + color: components.hpe.select.option.rest.textColor, border: { radius: dimensions.edgeSize[components.hpe.select.medium.option.borderRadius] || @@ -496,14 +496,14 @@ const buildTheme = tokens => { dimensions.borderSize[ components.hpe.select.medium.option.borderWidth ] || components.hpe.select.medium.option.borderWidth, - color: components.hpe.select.option.enabled.borderColor, + color: components.hpe.select.option.rest.borderColor, }, pad: { horizontal: components.hpe.select.medium.option.paddingX, vertical: components.hpe.select.medium.option.paddingY, }, font: { - weight: components.hpe.select.option.enabled.fontWeight, + weight: components.hpe.select.option.rest.fontWeight, }, }; @@ -526,9 +526,9 @@ const buildTheme = tokens => { const anchorSizeTheme = {}; textSizes.forEach(size => { anchorSizeTheme[size] = { - color: components.hpe.anchor.default.enabled.textColor, - textDecoration: components.hpe.anchor.default.enabled.textDecoration, - fontWeight: components.hpe.anchor.default.enabled.fontWeight, + color: components.hpe.anchor.default.rest.textColor, + textDecoration: components.hpe.anchor.default.rest.textDecoration, + fontWeight: components.hpe.anchor.default.rest.fontWeight, }; }); @@ -555,15 +555,15 @@ const buildTheme = tokens => { ? components.hpe.button.medium?.[kind].borderRadius : components.hpe.button[kind]?.medium.borderRadius; buttonKindTheme[kind] = { - background: components.hpe.button?.[kind].enabled.background, + background: components.hpe.button?.[kind].rest.background, border: { width: dimensions.borderSize[borderWidth] || borderWidth, - color: components.hpe.button?.[kind].enabled.borderColor, + color: components.hpe.button?.[kind].rest.borderColor, radius: dimensions.borderSize[borderRadius] || borderRadius, }, - color: components.hpe.button?.[kind].enabled.textColor, + color: components.hpe.button?.[kind].rest.textColor, font: { - weight: components.hpe.button?.[kind].enabled.fontWeight, + weight: components.hpe.button?.[kind].rest.fontWeight, }, }; }); @@ -578,19 +578,17 @@ const buildTheme = tokens => { buttonStatesTheme[state][kind] = { background: { color: - components.hpe.button?.[kind]?.[adjustedState].enabled.background, + components.hpe.button?.[kind]?.[adjustedState].rest.background, }, border: { // Q: this token isn't correct color: - components.hpe.button?.[kind]?.[adjustedState].enabled - .borderColor, + components.hpe.button?.[kind]?.[adjustedState].rest.borderColor, }, - color: - components.hpe.button?.[kind]?.[adjustedState].enabled.textColor, + color: components.hpe.button?.[kind]?.[adjustedState].rest.textColor, font: { weight: - components.hpe.button?.[kind]?.[adjustedState].enabled.fontWeight, + components.hpe.button?.[kind]?.[adjustedState].rest.fontWeight, }, }; } else if (kind === 'option') { @@ -598,13 +596,30 @@ const buildTheme = tokens => { buttonStatesTheme[state][kind] = { background: { color: - components.hpe.select.option?.[adjustedState].enabled.background, + components.hpe.select.option?.[adjustedState].rest.background, }, border: { color: components.hpe.select.option?.[adjustedState].borderColor, }, color: components.hpe.select.option?.[adjustedState].textColor, }; + } else if (state === 'disabled') { + buttonStatesTheme[state][kind] = { + background: { + color: + components.hpe.button?.[kind]?.[adjustedState].rest.background, + }, + border: { + width: '', + color: + components.hpe.button?.[kind]?.[adjustedState].rest.borderColor, + }, + color: components.hpe.button?.[kind]?.[adjustedState].rest.textColor, + font: { + weight: + components.hpe.button?.[kind]?.[adjustedState].rest.fontWeight, + }, + }; } else { buttonStatesTheme[state][kind] = { background: { @@ -853,10 +868,10 @@ const buildTheme = tokens => { }, }, anchor: { - color: components.hpe.anchor.default.enabled.textColor, - textDecoration: components.hpe.anchor.default.enabled.textDecoration, - fontWeight: components.hpe.anchor.default.enabled.fontWeight, - gap: components.hpe.anchor.medium.default.gapX, // TO DO not size specific + color: components.hpe.anchor.default.rest.textColor, + textDecoration: components.hpe.anchor.default.rest.textDecoration, + fontWeight: components.hpe.anchor.default.rest.fontWeight, + gap: components.hpe.anchor.default.medium.gapX, // TO DO not size specific hover: { textDecoration: components.hpe.anchor.default.hover.textDecoration, }, @@ -890,7 +905,7 @@ const buildTheme = tokens => { }, button: { intelligentPad: false, - color: components.hpe.button.default.enabled.textColor, + color: components.hpe.button.default.rest.textColor, gap: oldTheme ? components.hpe.button.medium.default.gapX : components.hpe.button.default.medium.gapX, @@ -931,10 +946,10 @@ const buildTheme = tokens => { }, selected: { option: { - background: components.hpe.select.option.selected.enabled.background, + background: components.hpe.select.option.selected.rest.background, color: components.hpe.select.option.selected.textColor, font: { - weight: components.hpe.select.option.selected.enabled.fontWeight, + weight: components.hpe.select.option.selected.rest.fontWeight, }, }, }, @@ -1105,9 +1120,9 @@ const buildTheme = tokens => { };`} `, // Q: missing token for hover borderWidth? this falls into similar boat as secondary button }, - color: components.hpe.switch.control.handle.enabled.background, + color: components.hpe.switch.control.handle.rest.background, border: { - color: components.hpe.checkbox.control.enabled.borderColor, + color: components.hpe.checkbox.control.rest.borderColor, width: dimensions.borderSize[ components.hpe.checkbox.medium.control.borderWidth @@ -1124,13 +1139,13 @@ const buildTheme = tokens => { }px; background: ${ theme.global.colors[ - components.hpe.checkbox.control.enabled.background + components.hpe.checkbox.control.rest.background ]?.[theme.dark ? 'dark' : 'light'] }; background-color: ${ checked || indeterminate ? theme.global.colors[ - components.hpe.checkbox.control.selected.enabled.background + components.hpe.checkbox.control.selected.rest.background ]?.[theme.dark ? 'dark' : 'light'] : '' }; @@ -1152,7 +1167,7 @@ const buildTheme = tokens => { extend: ({ theme }) => `stroke-width: 2px; stroke: ${ theme.global.colors[ - components.hpe.checkbox.control.selected.enabled.iconColor + components.hpe.checkbox.control.selected.rest.iconColor ]?.[theme.dark ? 'dark' : 'light'] }`, }, @@ -1171,8 +1186,8 @@ const buildTheme = tokens => { // Q is toggle and switch the same thing? // A: Yes, we can discuss if this name feels right or not. toggle: { - background: components.hpe.switch.control.track.enabled.background, - color: components.hpe.switch.control.handle.enabled.background, + background: components.hpe.switch.control.track.rest.background, + color: components.hpe.switch.control.handle.rest.background, size: components.hpe.switch.medium.control.track.width, // TO DO need token for handle elevation knob: { @@ -1186,7 +1201,7 @@ const buildTheme = tokens => { ] } solid ${ theme.global.colors[ - components.hpe.switch.control.handle.enabled.borderColor + components.hpe.switch.control.handle.rest.borderColor ][theme.dark ? 'dark' : 'light'] }; width: ${components.hpe.switch.medium.control.handle.width}; @@ -1198,7 +1213,7 @@ const buildTheme = tokens => { checked && `background-color: ${ theme.global.colors[ - components.hpe.switch.control.track.selected.enabled.background + components.hpe.switch.control.track.selected.rest.background ]?.[theme.dark ? 'dark' : 'light'] };` } @@ -1209,7 +1224,7 @@ const buildTheme = tokens => { }px; border-color: ${ theme.global.colors[ - components.hpe.switch.control.track.enabled.borderColor + components.hpe.switch.control.track.rest.borderColor ]?.[theme.dark ? 'dark' : 'light'] }; `, @@ -1261,7 +1276,7 @@ const buildTheme = tokens => { padding: 0px ${theme.global.edgeSize.xxsmall}; `, selected: { - background: components.hpe.dataCell.selected?.enabled?.background, + background: components.hpe.dataCell.selected?.rest?.background, }, }, groupHeader: { @@ -1274,7 +1289,7 @@ const buildTheme = tokens => { }, header: { border: { side: 'bottom' }, - color: components.hpe.headerCell.enabled.textColor, + color: components.hpe.headerCell.rest.textColor, extend: ({ column, sort, sortable, theme }) => ` ${ @@ -1314,7 +1329,7 @@ const buildTheme = tokens => { }, }, units: { - color: components.hpe.headerCell.units.enabled.textColor, // Q: missing token + color: components.hpe.headerCell.units.rest.textColor, // Q: missing token }, }, icons: { @@ -1340,7 +1355,7 @@ const buildTheme = tokens => { }, primary: { weight: components.hpe.dataCell.primary.fontWeight, - color: components.hpe.dataCell.primary.enabled.textColor, + color: components.hpe.dataCell.primary.rest.textColor, }, resize: { // Q: missing tokens @@ -1365,7 +1380,7 @@ const buildTheme = tokens => { size: components.hpe.formField.medium.input.container.borderWidth, }, button: { - background: components.hpe.button.default.enabled.background, + background: components.hpe.button.default.rest.background, border: { // Q: is this the correct value? // A: yes @@ -1381,9 +1396,9 @@ const buildTheme = tokens => { ? components.hpe.button.medium.default.paddingX : components.hpe.button.default.medium.paddingX, }, - color: components.hpe.button.default.enabled.textColor, + color: components.hpe.button.default.rest.textColor, font: { - weight: components.hpe.button.default.enabled.fontWeight, + weight: components.hpe.button.default.rest.fontWeight, }, hover: { background: components.hpe.button.default.hover.background, @@ -1452,7 +1467,7 @@ const buildTheme = tokens => { }, icon: , // TO DO need to handle modes size: 'xsmall', // Q: missing token - // Q: confused why we have both hpe.formField.errorText.enabled.textColor + // Q: confused why we have both hpe.formField.errorText.rest.textColor // and hpe.formField.errorText.disabled.color // A: This is to be able to style text differently in different states color: @@ -1765,7 +1780,7 @@ const buildTheme = tokens => { }, }, icons: { - color: components.hpe.menu.item.enabled.iconColor, + color: components.hpe.menu.item.rest.iconColor, down: Down, }, item: { @@ -2039,25 +2054,25 @@ const buildTheme = tokens => { }, pagination: { button: { - color: components.hpe.button.default.enabled.textColor, + color: components.hpe.button.default.rest.textColor, border: { radius: oldTheme ? components.hpe.button.medium.default.borderRadius : components.hpe.button.default.medium.borderRadius, }, font: { - weight: components.hpe.button.default.enabled.fontWeight, + weight: components.hpe.button.default.rest.fontWeight, }, active: { - background: components.hpe.button.default.selected.enabled.background, + background: components.hpe.button.default.selected.rest.background, border: { radius: oldTheme ? components.hpe.button.medium.default.borderRadius : components.hpe.button.default.medium.borderRadius, }, - color: components.hpe.button.default.selected.enabled.textColor, + color: components.hpe.button.default.selected.rest.textColor, font: { - weight: components.hpe.button.default.selected.enabled.fontWeight, + weight: components.hpe.button.default.selected.rest.fontWeight, }, }, hover: { @@ -2073,15 +2088,15 @@ const buildTheme = tokens => { }, }, disabled: { - background: components.hpe.button.default.disabled.background, + background: components.hpe.button.default.disabled.rest.background, border: { radius: oldTheme ? components.hpe.button.medium.default.borderRadius : components.hpe.button.default.medium.borderRadius, }, - color: components.hpe.button.default.disabled.textColor, + color: components.hpe.button.default.disabled.rest.textColor, font: { - weight: components.hpe.button.default.disabled.fontWeight, + weight: components.hpe.button.default.disabled.rest.fontWeight, }, }, size: { @@ -2180,10 +2195,10 @@ const buildTheme = tokens => { }, radioButton: { border: { - color: components.hpe.radioButton.control.enabled.borderColor, + color: components.hpe.radioButton.control.rest.borderColor, width: components.hpe.radioButton.medium.control.borderWidth, // TO DO want this narrower when not checked }, - color: components.hpe.radioButton.control.selected.enabled.borderColor, + color: components.hpe.radioButton.control.selected.rest.borderColor, container: { extend: () => ` width: auto; @@ -2209,9 +2224,7 @@ const buildTheme = tokens => { icons: { circle: () => ( @@ -2374,7 +2387,7 @@ const buildTheme = tokens => { }, border: { side: 'bottom', // TO DO this causes issues on the last row with the footer border - color: components.hpe.dataCell.enabled.borderColor, + color: components.hpe.dataCell.rest.borderColor, }, extend: ({ theme }) => ` @@ -2549,7 +2562,7 @@ const buildTheme = tokens => { }, container: { border: { - color: components.hpe.button.toolbar.enabled.borderColor, + color: components.hpe.button.toolbar.rest.borderColor, size: oldTheme ? components.hpe.button.medium.toolbar.borderWidth : components.hpe.button.toolbar.medium.borderWidth, @@ -2585,31 +2598,31 @@ export const warm = buildTheme({ components: localComponents, }); -export const old = buildTheme({ - light: oldLight, - dark: oldDark, - small: oldSmall, - large: oldLarge, - elevationlight: oldElevationLight, - elevationdark: oldElevationDark, - global: oldGlobal, - components: oldComponents, -}); +// export const old = buildTheme({ +// light: oldLight, +// dark: oldDark, +// small: oldSmall, +// large: oldLarge, +// elevationlight: oldElevationLight, +// elevationdark: oldElevationDark, +// global: oldGlobal, +// components: oldComponents, +// }); -export const refresh = buildTheme({ - light: refreshLight, - dark: refreshDark, - small: refreshSmall, - large: refreshLarge, - elevationlight: refreshElevationLight, - elevationdark: refreshElevationDark, - global: refreshGlobal, - components: refreshComponents, - refresh: true, -}); +// export const refresh = buildTheme({ +// light: refreshLight, +// dark: refreshDark, +// small: refreshSmall, +// large: refreshLarge, +// elevationlight: refreshElevationLight, +// elevationdark: refreshElevationDark, +// global: refreshGlobal, +// components: refreshComponents, +// refresh: true, +// }); export const themes = { local: current, - v3: old, - refresh, + // v3: old, + // refresh, }; From 329902cc1d711d633876fb7b0da8d21baec8b725 Mon Sep 17 00:00:00 2001 From: Taylor Seamans Date: Fri, 13 Dec 2024 13:36:29 -0800 Subject: [PATCH 2/6] Update yarn.lock (#4592) --- design-tokens/src/formats/commonJs.ts | 2 +- yarn.lock | 414 +++++++++++++------------- 2 files changed, 211 insertions(+), 205 deletions(-) diff --git a/design-tokens/src/formats/commonJs.ts b/design-tokens/src/formats/commonJs.ts index b99a87311..0fd964723 100644 --- a/design-tokens/src/formats/commonJs.ts +++ b/design-tokens/src/formats/commonJs.ts @@ -9,7 +9,7 @@ export const commonJs: FormatFn = async ({ }: FormatFnArguments) => { const { prefix } = platform; const tokens = prefix ? { [prefix]: dictionary.tokens } : dictionary.tokens; - // + const output = `${await fileHeader({ file, })}module.exports = ${JSON.stringify( diff --git a/yarn.lock b/yarn.lock index 4cfc4d160..44b279b90 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2493,7 +2493,7 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": +"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": version "0.3.25" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0" integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ== @@ -2705,37 +2705,32 @@ resolved "https://registry.yarnpkg.com/@radix-ui/number/-/number-1.1.0.tgz#1e95610461a09cdf8bb05c152e76ca1278d5da46" integrity sha512-V3gRzhVNU1ldS5XhAPTom1fOIo4ccrjjJgmE+LI2h/WaFpHmx0MQApT+KZHnx8abG6Avtfcz4WoEciMnpFT3HQ== -"@radix-ui/primitive@1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@radix-ui/primitive/-/primitive-1.1.0.tgz#42ef83b3b56dccad5d703ae8c42919a68798bbe2" - integrity sha512-4Z8dn6Upk0qk4P74xBhZ6Hd/w0mPEzOOLxy4xiPXOXqjF7jZS0VAKk7/x/H6FyY2zCkYJqePf1G5KmkmNJ4RBA== +"@radix-ui/primitive@1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@radix-ui/primitive/-/primitive-1.1.1.tgz#fc169732d755c7fbad33ba8d0cd7fd10c90dc8e3" + integrity sha512-SJ31y+Q/zAyShtXJc8x83i9TYdbAfHZ++tUZnvjJJqFjzsdUnKsxPL6IEtBlxKkU7yzer//GQtZSV4GbldL3YA== -"@radix-ui/react-arrow@1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@radix-ui/react-arrow/-/react-arrow-1.1.0.tgz#744f388182d360b86285217e43b6c63633f39e7a" - integrity sha512-FmlW1rCg7hBpEBwFbjHwCW6AmWLQM6g/v0Sn8XbP9NvmSZ2San1FpQeyPtufzOMSIx7Y4dzjlHoifhp+7NkZhw== +"@radix-ui/react-arrow@1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@radix-ui/react-arrow/-/react-arrow-1.1.1.tgz#2103721933a8bfc6e53bbfbdc1aaad5fc8ba0dd7" + integrity sha512-NaVpZfmv8SKeZbn4ijN2V3jlHA9ngBG16VnIIm22nUR0Yk8KUALyBxT3KYEUnNuch9sTE8UTsS3whzBgKOL30w== dependencies: - "@radix-ui/react-primitive" "2.0.0" + "@radix-ui/react-primitive" "2.0.1" -"@radix-ui/react-collection@1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@radix-ui/react-collection/-/react-collection-1.1.0.tgz#f18af78e46454a2360d103c2251773028b7724ed" - integrity sha512-GZsZslMJEyo1VKm5L1ZJY8tGDxZNPAoUeQUIbKeJfoi7Q4kmig5AsgLMYYuyYbfjd8fBmFORAIwYAkXMnXZgZw== +"@radix-ui/react-collection@1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@radix-ui/react-collection/-/react-collection-1.1.1.tgz#be2c7e01d3508e6d4b6d838f492e7d182f17d3b0" + integrity sha512-LwT3pSho9Dljg+wY2KN2mrrh6y3qELfftINERIzBUO9e0N+t0oMTyn3k9iv+ZqgrwGkRnLpNJrsMv9BZlt2yuA== dependencies: - "@radix-ui/react-compose-refs" "1.1.0" - "@radix-ui/react-context" "1.1.0" - "@radix-ui/react-primitive" "2.0.0" - "@radix-ui/react-slot" "1.1.0" - -"@radix-ui/react-compose-refs@1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.0.tgz#656432461fc8283d7b591dcf0d79152fae9ecc74" - integrity sha512-b4inOtiaOnYf9KWyO3jAeeCG6FeyfY6ldiEPanbUjWd+xIk5wZeHa8yVwmrJ2vderhu/BQvzCrJI0lHd+wIiqw== + "@radix-ui/react-compose-refs" "1.1.1" + "@radix-ui/react-context" "1.1.1" + "@radix-ui/react-primitive" "2.0.1" + "@radix-ui/react-slot" "1.1.1" -"@radix-ui/react-context@1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@radix-ui/react-context/-/react-context-1.1.0.tgz#6df8d983546cfd1999c8512f3a8ad85a6e7fcee8" - integrity sha512-OKrckBy+sMEgYM/sMmqmErVn0kZqrHPJze+Ql3DzYsDDp0hl0L62nx/2122/Bvps1qz645jlcu2tD9lrRSdf8A== +"@radix-ui/react-compose-refs@1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.1.tgz#6f766faa975f8738269ebb8a23bad4f5a8d2faec" + integrity sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw== "@radix-ui/react-context@1.1.1": version "1.1.1" @@ -2747,14 +2742,14 @@ resolved "https://registry.yarnpkg.com/@radix-ui/react-direction/-/react-direction-1.1.0.tgz#a7d39855f4d077adc2a1922f9c353c5977a09cdc" integrity sha512-BUuBvgThEiAXh2DWu93XsT+a3aWrGqolGlqqw5VU1kG7p/ZH2cuDlM1sRLNnY3QcBS69UIz2mcKhMxDsdewhjg== -"@radix-ui/react-dismissable-layer@1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.1.tgz#cbdcb739c5403382bdde5f9243042ba643883396" - integrity sha512-QSxg29lfr/xcev6kSz7MAlmDnzbP1eI/Dwn3Tp1ip0KT5CUELsxkekFEMVBEoykI3oV39hKT4TKZzBNMbcTZYQ== +"@radix-ui/react-dismissable-layer@1.1.2": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.2.tgz#771594b202f32bc8ffeb278c565f10c513814aee" + integrity sha512-kEHnlhv7wUggvhuJPkyw4qspXLJOdYoAP4dO2c8ngGuXTq1w/HZp1YeVB+NQ2KbH1iEG+pvOCGYSqh9HZOz6hg== dependencies: - "@radix-ui/primitive" "1.1.0" - "@radix-ui/react-compose-refs" "1.1.0" - "@radix-ui/react-primitive" "2.0.0" + "@radix-ui/primitive" "1.1.1" + "@radix-ui/react-compose-refs" "1.1.1" + "@radix-ui/react-primitive" "2.0.1" "@radix-ui/react-use-callback-ref" "1.1.0" "@radix-ui/react-use-escape-keydown" "1.1.0" @@ -2763,13 +2758,13 @@ resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.1.tgz#8635edd346304f8b42cae86b05912b61aef27afe" integrity sha512-pSIwfrT1a6sIoDASCSpFwOasEwKTZWDw/iBdtnqKO7v6FeOzYJ7U53cPzYFVR3geGGXgVHaH+CdngrrAzqUGxg== -"@radix-ui/react-focus-scope@1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.0.tgz#ebe2891a298e0a33ad34daab2aad8dea31caf0b2" - integrity sha512-200UD8zylvEyL8Bx+z76RJnASR2gRMuxlgFCPAe/Q/679a/r0eK3MBVYMb7vZODZcffZBdob1EGnky78xmVvcA== +"@radix-ui/react-focus-scope@1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.1.tgz#5c602115d1db1c4fcfa0fae4c3b09bb8919853cb" + integrity sha512-01omzJAYRxXdG2/he/+xy+c8a8gCydoQ1yOxnWNcRhrrBW5W+RQJ22EK1SaO8tb3WoUsuEw7mJjBozPzihDFjA== dependencies: - "@radix-ui/react-compose-refs" "1.1.0" - "@radix-ui/react-primitive" "2.0.0" + "@radix-ui/react-compose-refs" "1.1.1" + "@radix-ui/react-primitive" "2.0.1" "@radix-ui/react-use-callback-ref" "1.1.0" "@radix-ui/react-icons@^1.3.0": @@ -2784,80 +2779,80 @@ dependencies: "@radix-ui/react-use-layout-effect" "1.1.0" -"@radix-ui/react-popper@1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@radix-ui/react-popper/-/react-popper-1.2.0.tgz#a3e500193d144fe2d8f5d5e60e393d64111f2a7a" - integrity sha512-ZnRMshKF43aBxVWPWvbj21+7TQCvhuULWJ4gNIKYpRlQt5xGRhLx66tMp8pya2UkGHTSlhpXwmjqltDYHhw7Vg== +"@radix-ui/react-popper@1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@radix-ui/react-popper/-/react-popper-1.2.1.tgz#2fc66cfc34f95f00d858924e3bee54beae2dff0a" + integrity sha512-3kn5Me69L+jv82EKRuQCXdYyf1DqHwD2U/sxoNgBGCB7K9TRc3bQamQ+5EPM9EvyPdli0W41sROd+ZU1dTCztw== dependencies: "@floating-ui/react-dom" "^2.0.0" - "@radix-ui/react-arrow" "1.1.0" - "@radix-ui/react-compose-refs" "1.1.0" - "@radix-ui/react-context" "1.1.0" - "@radix-ui/react-primitive" "2.0.0" + "@radix-ui/react-arrow" "1.1.1" + "@radix-ui/react-compose-refs" "1.1.1" + "@radix-ui/react-context" "1.1.1" + "@radix-ui/react-primitive" "2.0.1" "@radix-ui/react-use-callback-ref" "1.1.0" "@radix-ui/react-use-layout-effect" "1.1.0" "@radix-ui/react-use-rect" "1.1.0" "@radix-ui/react-use-size" "1.1.0" "@radix-ui/rect" "1.1.0" -"@radix-ui/react-portal@1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@radix-ui/react-portal/-/react-portal-1.1.2.tgz#51eb46dae7505074b306ebcb985bf65cc547d74e" - integrity sha512-WeDYLGPxJb/5EGBoedyJbT0MpoULmwnIPMJMSldkuiMsBAv7N1cRdsTWZWht9vpPOiN3qyiGAtbK2is47/uMFg== +"@radix-ui/react-portal@1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@radix-ui/react-portal/-/react-portal-1.1.3.tgz#b0ea5141103a1671b715481b13440763d2ac4440" + integrity sha512-NciRqhXnGojhT93RPyDaMPfLH3ZSl4jjIFbZQ1b/vxvZEdHsBZ49wP9w8L3HzUQwep01LcWtkUvm0OVB5JAHTw== dependencies: - "@radix-ui/react-primitive" "2.0.0" + "@radix-ui/react-primitive" "2.0.1" "@radix-ui/react-use-layout-effect" "1.1.0" -"@radix-ui/react-primitive@2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@radix-ui/react-primitive/-/react-primitive-2.0.0.tgz#fe05715faa9203a223ccc0be15dc44b9f9822884" - integrity sha512-ZSpFm0/uHa8zTvKBDjLFWLo8dkr4MBsiDLz0g3gMUwqgLHz9rTaRRGYDgvZPtBJgYCBKXkS9fzmoySgr8CO6Cw== +"@radix-ui/react-primitive@2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@radix-ui/react-primitive/-/react-primitive-2.0.1.tgz#6d9efc550f7520135366f333d1e820cf225fad9e" + integrity sha512-sHCWTtxwNn3L3fH8qAfnF3WbUZycW93SM1j3NFDzXBiz8D6F5UTTy8G1+WFEaiCdvCVRJWj6N2R4Xq6HdiHmDg== dependencies: - "@radix-ui/react-slot" "1.1.0" + "@radix-ui/react-slot" "1.1.1" "@radix-ui/react-select@^2.1.1": - version "2.1.2" - resolved "https://registry.yarnpkg.com/@radix-ui/react-select/-/react-select-2.1.2.tgz#2346e118966db793940f6a866fd4cc5db2cc275e" - integrity sha512-rZJtWmorC7dFRi0owDmoijm6nSJH1tVw64QGiNIZ9PNLyBDtG+iAq+XGsya052At4BfarzY/Dhv9wrrUr6IMZA== + version "2.1.3" + resolved "https://registry.yarnpkg.com/@radix-ui/react-select/-/react-select-2.1.3.tgz#b3f0ed2ae8fb9ebb03baaec49f9856e24628fc16" + integrity sha512-tlLwaewTfrKetiex8iW9wwME/qrYlzlH0qcgYmos7xS54MO00SiPHasLoAykg/yVrjf41GQptPPi4oXzrP+sgg== dependencies: "@radix-ui/number" "1.1.0" - "@radix-ui/primitive" "1.1.0" - "@radix-ui/react-collection" "1.1.0" - "@radix-ui/react-compose-refs" "1.1.0" + "@radix-ui/primitive" "1.1.1" + "@radix-ui/react-collection" "1.1.1" + "@radix-ui/react-compose-refs" "1.1.1" "@radix-ui/react-context" "1.1.1" "@radix-ui/react-direction" "1.1.0" - "@radix-ui/react-dismissable-layer" "1.1.1" + "@radix-ui/react-dismissable-layer" "1.1.2" "@radix-ui/react-focus-guards" "1.1.1" - "@radix-ui/react-focus-scope" "1.1.0" + "@radix-ui/react-focus-scope" "1.1.1" "@radix-ui/react-id" "1.1.0" - "@radix-ui/react-popper" "1.2.0" - "@radix-ui/react-portal" "1.1.2" - "@radix-ui/react-primitive" "2.0.0" - "@radix-ui/react-slot" "1.1.0" + "@radix-ui/react-popper" "1.2.1" + "@radix-ui/react-portal" "1.1.3" + "@radix-ui/react-primitive" "2.0.1" + "@radix-ui/react-slot" "1.1.1" "@radix-ui/react-use-callback-ref" "1.1.0" "@radix-ui/react-use-controllable-state" "1.1.0" "@radix-ui/react-use-layout-effect" "1.1.0" "@radix-ui/react-use-previous" "1.1.0" - "@radix-ui/react-visually-hidden" "1.1.0" + "@radix-ui/react-visually-hidden" "1.1.1" aria-hidden "^1.1.1" react-remove-scroll "2.6.0" -"@radix-ui/react-slot@1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-1.1.0.tgz#7c5e48c36ef5496d97b08f1357bb26ed7c714b84" - integrity sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw== +"@radix-ui/react-slot@1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@radix-ui/react-slot/-/react-slot-1.1.1.tgz#ab9a0ffae4027db7dc2af503c223c978706affc3" + integrity sha512-RApLLOcINYJA+dMVbOju7MYv1Mb2EBp2nH4HdDzXTSyaR5optlm6Otrz1euW3HbdOR8UmmFK06TD+A9frYWv+g== dependencies: - "@radix-ui/react-compose-refs" "1.1.0" + "@radix-ui/react-compose-refs" "1.1.1" "@radix-ui/react-switch@^1.1.0": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@radix-ui/react-switch/-/react-switch-1.1.1.tgz#1401658c24d66a18610f18793afbaa7fedf5429a" - integrity sha512-diPqDDoBcZPSicYoMWdWx+bCPuTRH4QSp9J+65IvtdS0Kuzt67bI6n32vCj8q6NZmYW/ah+2orOtMwcX5eQwIg== + version "1.1.2" + resolved "https://registry.yarnpkg.com/@radix-ui/react-switch/-/react-switch-1.1.2.tgz#61323f4cccf25bf56c95fceb3b56ce1407bc9aec" + integrity sha512-zGukiWHjEdBCRyXvKR6iXAQG6qXm2esuAD6kDOi9Cn+1X6ev3ASo4+CsYaD6Fov9r/AQFekqnD/7+V0Cs6/98g== dependencies: - "@radix-ui/primitive" "1.1.0" - "@radix-ui/react-compose-refs" "1.1.0" + "@radix-ui/primitive" "1.1.1" + "@radix-ui/react-compose-refs" "1.1.1" "@radix-ui/react-context" "1.1.1" - "@radix-ui/react-primitive" "2.0.0" + "@radix-ui/react-primitive" "2.0.1" "@radix-ui/react-use-controllable-state" "1.1.0" "@radix-ui/react-use-previous" "1.1.0" "@radix-ui/react-use-size" "1.1.0" @@ -2905,12 +2900,12 @@ dependencies: "@radix-ui/react-use-layout-effect" "1.1.0" -"@radix-ui/react-visually-hidden@1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.1.0.tgz#ad47a8572580f7034b3807c8e6740cd41038a5a2" - integrity sha512-N8MDZqtgCgG5S3aV60INAB475osJousYpZ4cTJ2cFbMpdHS5Y6loLTH8LPtkj2QN0x93J30HT/M3qJXM0+lyeQ== +"@radix-ui/react-visually-hidden@1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.1.1.tgz#f7b48c1af50dfdc366e92726aee6d591996c5752" + integrity sha512-vVfA2IZ9q/J+gEamvj761Oq1FpWgCDaNOOIfbPVp2MVPLEomUr5+Vf7kJGwQ24YxZSlQVar7Bes8kyTo5Dshpg== dependencies: - "@radix-ui/react-primitive" "2.0.0" + "@radix-ui/react-primitive" "2.0.1" "@radix-ui/rect@1.1.0": version "1.1.0" @@ -5094,13 +5089,13 @@ browser-process-hrtime@^1.0.0: integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== browserslist@^4.23.3, browserslist@^4.24.0, browserslist@^4.24.2: - version "4.24.2" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.2.tgz#f5845bc91069dbd55ee89faf9822e1d885d16580" - integrity sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg== + version "4.24.3" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.3.tgz#5fc2725ca8fb3c1432e13dac278c7cc103e026d2" + integrity sha512-1CPmv8iobE2fyRMV97dAcMVegvvWKxmq94hkLiAkUGwKVTyDLw33K+ZxiFrREKmmps4rIw6grcCFCnTMSZ/YiA== dependencies: - caniuse-lite "^1.0.30001669" - electron-to-chromium "^1.5.41" - node-releases "^2.0.18" + caniuse-lite "^1.0.30001688" + electron-to-chromium "^1.5.73" + node-releases "^2.0.19" update-browserslist-db "^1.1.1" bs-logger@^0.2.6: @@ -5142,7 +5137,7 @@ bytes@3.1.2: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== -call-bind-apply-helpers@^1.0.0: +call-bind-apply-helpers@^1.0.0, call-bind-apply-helpers@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz#32e5892e6361b29b0b545ba6f7763378daca2840" integrity sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g== @@ -5214,10 +5209,10 @@ camelize@^1.0.0: resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.1.tgz#89b7e16884056331a35d6b5ad064332c91daa6c3" integrity sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ== -caniuse-lite@^1.0.30001579, caniuse-lite@^1.0.30001646, caniuse-lite@^1.0.30001669: - version "1.0.30001687" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001687.tgz#d0ac634d043648498eedf7a3932836beba90ebae" - integrity sha512-0S/FDhf4ZiqrTUiQ39dKeUjYRjkv7lOZU1Dgif2rIqrTzX/1wV2hfKu9TOm1IHkdSijfLswxTFzl/cvir+SLSQ== +caniuse-lite@^1.0.30001579, caniuse-lite@^1.0.30001646, caniuse-lite@^1.0.30001688: + version "1.0.30001688" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001688.tgz#f9d3ede749f083ce0db4c13db9d828adaf2e8d0a" + integrity sha512-Nmqpru91cuABu/DTCXbM2NSRHzM2uVHfPnhJ/1zEAJx/ILBRVmz3pzH4N7DZqbdG0gWClsCC05Oj0mJ/1AWMbA== case-sensitive-paths-webpack-plugin@^2.4.0: version "2.4.0" @@ -6300,10 +6295,10 @@ ejs@^3.1.10: dependencies: jake "^10.8.5" -electron-to-chromium@^1.5.41: - version "1.5.72" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.72.tgz#a732805986d3a5b5fedd438ddf4616c7d78ac2df" - integrity sha512-ZpSAUOZ2Izby7qnZluSrAlGgGQzucmFbN0n64dYzocYxnxV5ufurpj3VgEe4cUp7ir9LmeLxNYo8bVnlM8bQHw== +electron-to-chromium@^1.5.73: + version "1.5.73" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.73.tgz#f32956ce40947fa3c8606726a96cd8fb5bb5f720" + integrity sha512-8wGNxG9tAG5KhGd3eeA0o6ixhiNdgr0DcHWm85XPCphwZgD1lIEoi6t3VERayWao7SF7AAZTw6oARGJeVjH8Kg== elegant-spinner@^1.0.1: version "1.0.1" @@ -7584,19 +7579,21 @@ get-func-name@^2.0.0, get-func-name@^2.0.2: resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.2.tgz#0d7cf20cd13fda808669ffa88f4ffc7a3943fc41" integrity sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ== -get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4, get-intrinsic@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.5.tgz#dfe7dd1b30761b464fe51bf4bb00ac7c37b681e7" - integrity sha512-Y4+pKa7XeRUPWFNvOOYHkRYrfzW07oraURSvjDmRVOJ748OrVmeXtpE4+GCEHncjCjkTxPNRt8kEbxDhsn6VTg== +get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6: + version "1.2.6" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.6.tgz#43dd3dd0e7b49b82b2dfcad10dc824bf7fc265d5" + integrity sha512-qxsEs+9A+u85HhllWJJFicJfPDhRmjzoYdl64aMWW9yRIJmSyxdn8IEkuIM530/7T+lv0TIHd8L6Q/ra0tEoeA== dependencies: - call-bind-apply-helpers "^1.0.0" + call-bind-apply-helpers "^1.0.1" dunder-proto "^1.0.0" es-define-property "^1.0.1" es-errors "^1.3.0" + es-object-atoms "^1.0.0" function-bind "^1.1.2" gopd "^1.2.0" has-symbols "^1.1.0" hasown "^2.0.2" + math-intrinsics "^1.0.0" get-nonce@^1.0.0: version "1.0.1" @@ -7781,7 +7778,7 @@ globby@^6.1.0: pify "^2.0.0" pinkie-promise "^2.0.0" -gopd@^1.0.1, gopd@^1.1.0, gopd@^1.2.0: +gopd@^1.0.1, gopd@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1" integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg== @@ -7810,7 +7807,7 @@ grommet-icons@^4.12.1: "grommet-icons@https://github.com/grommet/grommet-icons/tarball/stable": version "4.12.1" - resolved "https://github.com/grommet/grommet-icons/tarball/stable#92f4e88ab19fa618a4952ac74802f606bf44c207" + resolved "https://github.com/grommet/grommet-icons/tarball/stable#71bd354fe44dfd6544cb8b67af22f06067d93f78" grommet-theme-hpe@5.7.0: version "5.7.0" @@ -7819,7 +7816,7 @@ grommet-theme-hpe@5.7.0: "grommet@https://github.com/grommet/grommet/tarball/stable": version "2.43.0" - resolved "https://github.com/grommet/grommet/tarball/stable#90ad433077177993b820c161e178004c3708d236" + resolved "https://github.com/grommet/grommet/tarball/stable#23c65d651bdc47dcc0417fc481312470f85a80d4" dependencies: "@emotion/is-prop-valid" "^1.3.1" grommet-icons "^4.12.1" @@ -8334,13 +8331,13 @@ inline-style-parser@0.2.4: integrity sha512-0aO8FkhNZlj/ZIbNi7Lxxr12obT7cL1moPfE4tg1LkX7LlLfC6DeX4l2ZEud1ukP9jNQyNnfzQVqwbwmAATY4Q== internal-slot@^1.0.4, internal-slot@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802" - integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g== + version "1.1.0" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.1.0.tgz#1eac91762947d2f7056bc838d93e13b2e9604961" + integrity sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw== dependencies: es-errors "^1.3.0" - hasown "^2.0.0" - side-channel "^1.0.4" + hasown "^2.0.2" + side-channel "^1.1.0" interpret@^3.1.1: version "3.1.1" @@ -8404,12 +8401,12 @@ is-alphanumerical@^2.0.0: is-decimal "^2.0.0" is-arguments@^1.0.4, is-arguments@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" - integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== + version "1.2.0" + resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.2.0.tgz#ad58c6aecf563b78ef2bf04df540da8f5d7d8e1b" + integrity sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA== dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" + call-bound "^1.0.2" + has-tostringtag "^1.0.2" is-array-buffer@^3.0.2, is-array-buffer@^3.0.4: version "3.0.4" @@ -8446,11 +8443,11 @@ is-binary-path@~2.1.0: binary-extensions "^2.0.0" is-boolean-object@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.2.0.tgz#9743641e80a62c094b5941c5bb791d66a88e497a" - integrity sha512-kR5g0+dXf/+kXnqI+lu0URKYPKgICtHGGNCDSB10AaUFj3o/HkB3u7WfpRBJGFopxxY0oH3ux7ZsDjLtK7xqvw== + version "1.2.1" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.2.1.tgz#c20d0c654be05da4fbc23c562635c019e93daf89" + integrity sha512-l9qO6eFlUETHtuihLcYOaLKByJ1f+N4kthcU9YjHy3N+B3hWv0y/2Nd0mu/7lTFnRQHTrSdXF50HQ3bl5fEnng== dependencies: - call-bind "^1.0.7" + call-bound "^1.0.2" has-tostringtag "^1.0.2" is-callable@^1.1.3, is-callable@^1.2.7: @@ -8465,26 +8462,29 @@ is-ci@^1.0.10: dependencies: ci-info "^1.5.0" -is-core-module@^2.13.0, is-core-module@^2.15.1: - version "2.15.1" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37" - integrity sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ== +is-core-module@^2.13.0, is-core-module@^2.15.1, is-core-module@^2.16.0: + version "2.16.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.0.tgz#6c01ffdd5e33c49c1d2abfa93334a85cb56bd81c" + integrity sha512-urTSINYfAYgcbLb0yDQ6egFm6h3Mo1DcF9EkyXSRjjzdHbsulg01qhwWuXdOoUBuTkbQ80KDboXa0vFJ+BDH+g== dependencies: hasown "^2.0.2" is-data-view@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.1.tgz#4b4d3a511b70f3dc26d42c03ca9ca515d847759f" - integrity sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w== + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.2.tgz#bae0a41b9688986c2188dda6657e56b8f9e63b8e" + integrity sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw== dependencies: + call-bound "^1.0.2" + get-intrinsic "^1.2.6" is-typed-array "^1.1.13" -is-date-object@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" - integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== +is-date-object@^1.0.5, is-date-object@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.1.0.tgz#ad85541996fc7aa8b2729701d27b7319f95d82f7" + integrity sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg== dependencies: - has-tostringtag "^1.0.0" + call-bound "^1.0.2" + has-tostringtag "^1.0.2" is-decimal@^1.0.0: version "1.0.4" @@ -8663,13 +8663,13 @@ is-potential-custom-element-name@^1.0.1: resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== -is-regex@^1.1.4: - version "1.2.0" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.2.0.tgz#41b9d266e7eb7451312c64efc37e8a7d453077cf" - integrity sha512-B6ohK4ZmoftlUe+uvenXSbPJFo6U37BH7oO1B3nQH8f/7h27N56s85MhUtbFJAziz5dcmuR3i8ovUl35zp8pFA== +is-regex@^1.1.4, is-regex@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.2.1.tgz#76d70a3ed10ef9be48eb577887d74205bf0cad22" + integrity sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g== dependencies: - call-bind "^1.0.7" - gopd "^1.1.0" + call-bound "^1.0.2" + gopd "^1.2.0" has-tostringtag "^1.0.2" hasown "^2.0.2" @@ -8706,13 +8706,13 @@ is-subdir@^1.1.1: better-path-resolve "1.0.0" is-symbol@^1.0.4, is-symbol@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.1.0.tgz#ae993830a56d4781886d39f9f0a46b3e89b7b60b" - integrity sha512-qS8KkNNXUZ/I+nX6QT8ZS1/Yx0A444yhzdTKxCzKkNjQ9sHErBxJnJAgh+f5YhusYECEcjo4XcyH87hn6+ks0A== + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.1.1.tgz#f47761279f532e2b05a7024a7506dbbedacd0634" + integrity sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w== dependencies: - call-bind "^1.0.7" - has-symbols "^1.0.3" - safe-regex-test "^1.0.3" + call-bound "^1.0.2" + has-symbols "^1.1.0" + safe-regex-test "^1.1.0" is-typed-array@^1.1.13, is-typed-array@^1.1.3: version "1.1.13" @@ -8744,11 +8744,11 @@ is-weakmap@^2.0.2: integrity sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w== is-weakref@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" - integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.1.0.tgz#47e3472ae95a63fa9cf25660bcf0c181c39770ef" + integrity sha512-SXM8Nwyys6nT5WP6pltOwKytLV7FqQ4UiibxVmW+EIosHcmCqkkjViTb5SNssDlkCiEYRP1/pdWUKVvZBmsR2Q== dependencies: - call-bind "^1.0.2" + call-bound "^1.0.2" is-weakset@^2.0.3: version "2.0.3" @@ -8849,15 +8849,16 @@ istanbul-reports@^3.1.3: istanbul-lib-report "^3.0.0" iterator.prototype@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.3.tgz#016c2abe0be3bbdb8319852884f60908ac62bf9c" - integrity sha512-FW5iMbeQ6rBGm/oKgzq2aW4KvAGpxPzYES8N4g4xNXUKpL1mclMvOe+76AcLDTvD+Ze+sOpVhgdAQEKF4L9iGQ== + version "1.1.4" + resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.4.tgz#4ae6cf98b97fdc717b7e159d79dc25f8fc9482f1" + integrity sha512-x4WH0BWmrMmg4oHHl+duwubhrvczGlyuGAZu3nvrf0UXOfPu8IhZObFEr7DE/iv01YgVZrsOiRcqw2srkKEDIA== dependencies: - define-properties "^1.2.1" - get-intrinsic "^1.2.1" - has-symbols "^1.0.3" - reflect.getprototypeof "^1.0.4" - set-function-name "^2.0.1" + define-data-property "^1.1.4" + es-object-atoms "^1.0.0" + get-intrinsic "^1.2.6" + has-symbols "^1.1.0" + reflect.getprototypeof "^1.0.8" + set-function-name "^2.0.2" jackspeak@^3.1.2: version "3.4.3" @@ -10127,6 +10128,11 @@ match-url-wildcard@0.0.4: dependencies: escape-string-regexp "^1.0.5" +math-intrinsics@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.0.0.tgz#4e04bf87c85aa51e90d078dac2252b4eb5260817" + integrity sha512-4MqMiKP90ybymYvsut0CH2g4XWbfLtmlCkXmtmdcDCxNB+mQcu1w/1+L/VD7vi/PSv7X2JYV7SCcR+jiPXnQtA== + mdast-util-find-and-replace@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/mdast-util-find-and-replace/-/mdast-util-find-and-replace-3.0.1.tgz#a6fc7b62f0994e973490e45262e4bc07607b04e0" @@ -11005,7 +11011,7 @@ node-int64@^0.4.0: resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw== -node-releases@^2.0.18: +node-releases@^2.0.19: version "2.0.19" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.19.tgz#9e445a52950951ec4d177d843af370b411caf314" integrity sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw== @@ -11384,12 +11390,11 @@ parse-entities@^2.0.0: is-hexadecimal "^1.0.0" parse-entities@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-4.0.1.tgz#4e2a01111fb1c986549b944af39eeda258fc9e4e" - integrity sha512-SWzvYcSJh4d/SGLIOQfZ/CoNv6BTlI6YEQ7Nj82oDVnRpwe/Z/F1EMx42x3JAOwGBlCjeCH0BRJQbQ/opHL17w== + version "4.0.2" + resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-4.0.2.tgz#61d46f5ed28e4ee62e9ddc43d6b010188443f159" + integrity sha512-GG2AQYWoLgL877gQIKeRPGO1xF9+eG1ujIb5soS5gPvLQ1y2o8FL90w2QWNdf9I361Mpp7726c+lj3U0qK1uGw== dependencies: "@types/unist" "^2.0.0" - character-entities "^2.0.0" character-entities-legacy "^3.0.0" character-reference-invalid "^2.0.0" decode-named-character-reference "^1.0.0" @@ -12269,7 +12274,7 @@ redent@^3.0.0: indent-string "^4.0.0" strip-indent "^3.0.0" -reflect.getprototypeof@^1.0.4, reflect.getprototypeof@^1.0.6: +reflect.getprototypeof@^1.0.6, reflect.getprototypeof@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.8.tgz#c58afb17a4007b4d1118c07b92c23fca422c5d82" integrity sha512-B5dj6usc5dkk8uFliwjwDHM8To5/QwdKz9JcBZ8Ic4G1f0YmeeJTtE/ZTdgRFPAfxZFiUaPhZ1Jcs4qeagItGQ== @@ -12507,11 +12512,11 @@ resolve.exports@^2.0.0: integrity sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A== resolve@^1.1.7, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.1, resolve@^1.22.4, resolve@^1.22.8: - version "1.22.8" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d" - integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw== + version "1.22.9" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.9.tgz#6da76e4cdc57181fa4471231400e8851d0a924f3" + integrity sha512-QxrmX1DzraFIi9PxdG5VkRfRwIgjwyud+z/iBwfRRrVmHc+P9Q7u2lSSpQ6bjr2gy5lrqIiU9vb6iAeGf2400A== dependencies: - is-core-module "^2.13.0" + is-core-module "^2.16.0" path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" @@ -12591,13 +12596,14 @@ rxjs@^7.8.1: tslib "^2.1.0" safe-array-concat@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.2.tgz#81d77ee0c4e8b863635227c721278dd524c20edb" - integrity sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q== + version "1.1.3" + resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.3.tgz#c9e54ec4f603b0bbb8e7e5007a5ee7aecd1538c3" + integrity sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q== dependencies: - call-bind "^1.0.7" - get-intrinsic "^1.2.4" - has-symbols "^1.0.3" + call-bind "^1.0.8" + call-bound "^1.0.2" + get-intrinsic "^1.2.6" + has-symbols "^1.1.0" isarray "^2.0.5" safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0: @@ -12610,14 +12616,14 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-regex-test@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377" - integrity sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw== +safe-regex-test@^1.0.3, safe-regex-test@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.1.0.tgz#7f87dfb67a3150782eaaf18583ff5d1711ac10c1" + integrity sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw== dependencies: - call-bind "^1.0.6" + call-bound "^1.0.2" es-errors "^1.3.0" - is-regex "^1.1.4" + is-regex "^1.2.1" "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": version "2.1.2" @@ -12663,7 +12669,7 @@ schema-utils@^3.1.1, schema-utils@^3.2.0: ajv "^6.12.5" ajv-keywords "^3.5.2" -schema-utils@^4.0.0: +schema-utils@^4.0.0, schema-utils@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.3.0.tgz#3b669f04f71ff2dfb5aba7ce2d5a9d79b35622c0" integrity sha512-Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g== @@ -12745,7 +12751,7 @@ sentence-case@^2.1.0: no-case "^2.2.0" upper-case-first "^1.1.2" -serialize-javascript@^6.0.1: +serialize-javascript@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2" integrity sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g== @@ -12792,7 +12798,7 @@ set-function-length@^1.2.2: gopd "^1.0.1" has-property-descriptors "^1.0.2" -set-function-name@^2.0.1, set-function-name@^2.0.2: +set-function-name@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985" integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ== @@ -12870,7 +12876,7 @@ side-channel-weakmap@^1.0.2: object-inspect "^1.13.3" side-channel-map "^1.0.1" -side-channel@^1.0.4, side-channel@^1.0.6: +side-channel@^1.0.4, side-channel@^1.0.6, side-channel@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.0.tgz#c3fcff9c4da932784873335ec9765fa94ff66bc9" integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw== @@ -13490,17 +13496,17 @@ terminal-link@^2.0.0: supports-hyperlinks "^2.0.0" terser-webpack-plugin@^5.3.1, terser-webpack-plugin@^5.3.10: - version "5.3.10" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199" - integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w== + version "5.3.11" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.11.tgz#93c21f44ca86634257cac176f884f942b7ba3832" + integrity sha512-RVCsMfuD0+cTt3EwX8hSl2Ks56EbFHWmhluwcqoPKtBnfjiT6olaq7PRIRfhyU8nnC2MrnDrBLfrD/RGE+cVXQ== dependencies: - "@jridgewell/trace-mapping" "^0.3.20" + "@jridgewell/trace-mapping" "^0.3.25" jest-worker "^27.4.5" - schema-utils "^3.1.1" - serialize-javascript "^6.0.1" - terser "^5.26.0" + schema-utils "^4.3.0" + serialize-javascript "^6.0.2" + terser "^5.31.1" -terser@^5.10.0, terser@^5.26.0: +terser@^5.10.0, terser@^5.31.1: version "5.37.0" resolved "https://registry.yarnpkg.com/terser/-/terser-5.37.0.tgz#38aa66d1cfc43d0638fab54e43ff8a4f72a21ba3" integrity sha512-B8wRRkmre4ERucLM/uXx4MOV5cbnOlVAqUst+1+iLKPI0dOgFO28f84ptoQt9HEI537PMzfYa/d+GEPKTRXmYA== @@ -14753,7 +14759,7 @@ whatwg-url@^8.0.0, whatwg-url@^8.5.0: tr46 "^2.1.0" webidl-conversions "^6.1.0" -which-boxed-primitive@^1.0.2: +which-boxed-primitive@^1.0.2, which-boxed-primitive@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.1.0.tgz#2d850d6c4ac37b95441a67890e19f3fda8b6c6d9" integrity sha512-Ei7Miu/AXe2JJ4iNF5j/UphAgRoma4trE6PtisM09bPygb3egMH3YLW/befsWb1A1AxvNSFidOFTB18XtnIIng== @@ -14765,23 +14771,23 @@ which-boxed-primitive@^1.0.2: is-symbol "^1.1.0" which-builtin-type@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.2.0.tgz#58042ac9602d78a6d117c7e811349df1268ba63c" - integrity sha512-I+qLGQ/vucCby4tf5HsLmGueEla4ZhwTBSqaooS+Y0BuxN4Cp+okmGuV+8mXZ84KDI9BA+oklo+RzKg0ONdSUA== + version "1.2.1" + resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.2.1.tgz#89183da1b4907ab089a6b02029cc5d8d6574270e" + integrity sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q== dependencies: - call-bind "^1.0.7" + call-bound "^1.0.2" function.prototype.name "^1.1.6" has-tostringtag "^1.0.2" is-async-function "^2.0.0" - is-date-object "^1.0.5" + is-date-object "^1.1.0" is-finalizationregistry "^1.1.0" is-generator-function "^1.0.10" - is-regex "^1.1.4" + is-regex "^1.2.1" is-weakref "^1.0.2" isarray "^2.0.5" - which-boxed-primitive "^1.0.2" + which-boxed-primitive "^1.1.0" which-collection "^1.0.2" - which-typed-array "^1.1.15" + which-typed-array "^1.1.16" which-collection@^1.0.1, which-collection@^1.0.2: version "1.0.2" @@ -14802,7 +14808,7 @@ which-promise@^1.0.0: pinkie-promise "^1.0.0" which "^1.1.2" -which-typed-array@^1.1.13, which-typed-array@^1.1.14, which-typed-array@^1.1.15, which-typed-array@^1.1.2: +which-typed-array@^1.1.13, which-typed-array@^1.1.14, which-typed-array@^1.1.15, which-typed-array@^1.1.16, which-typed-array@^1.1.2: version "1.1.16" resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.16.tgz#db4db429c4706feca2f01677a144278e4a8c216b" integrity sha512-g+N+GAWiRj66DngFwHvISJd+ITsyphZvD1vChfVg6cEdnzy53GzB3oy0fUNlvhz7H7+MiqhYr26qxQShCpKTTQ== From 01f2cf41ce93c88eb24be8e9977bfef58d91f339 Mon Sep 17 00:00:00 2001 From: Matthew Glissmann Date: Fri, 13 Dec 2024 16:36:57 -0700 Subject: [PATCH 3/6] sticker-sheet layout (#4594) --- .../src/pages/sticker-sheet/index.jsx | 869 ++++++++++-------- 1 file changed, 474 insertions(+), 395 deletions(-) diff --git a/sandbox/grommet-app/src/pages/sticker-sheet/index.jsx b/sandbox/grommet-app/src/pages/sticker-sheet/index.jsx index 945deb6ae..1af319bd3 100644 --- a/sandbox/grommet-app/src/pages/sticker-sheet/index.jsx +++ b/sandbox/grommet-app/src/pages/sticker-sheet/index.jsx @@ -1,6 +1,7 @@ /* eslint-disable react/jsx-key */ -import React, { useMemo } from 'react'; +import React, { useContext, useMemo } from 'react'; import PropTypes from 'prop-types'; +import { Link } from 'react-router-dom'; import { Anchor, Box, @@ -42,9 +43,18 @@ import { Meter, ToggleGroup, } from 'grommet'; -import { User, Table, List, MapLocation } from 'grommet-icons'; +import { User, Table, List, MapLocation, Previous } from 'grommet-icons'; import { hpe } from 'grommet-theme-hpe'; import { current as hpeCurrent } from '../../theme'; +import ContentPane from '../../components/ContentPane'; + +const StyleInProgress = () => ( + +); const textSizes = [ 'xsmall', @@ -67,16 +77,25 @@ const ModeContext = React.createContext({}); const Compare = ({ children, ...rest }) => { const { mode, direction } = React.useContext(ModeContext); + const theme = useContext(ThemeContext); if (direction === 'row') { return ( - + {children} - - + + {children} - + ); } @@ -90,7 +109,7 @@ const Compare = ({ children, ...rest }) => { // eslint-disable-next-line no-nested-ternary mode === 'Compare diffs' ? { opacity: 0.5, filter: 'invert(1)', color: 'green' } - : mode === 'tokens' + : mode === 'next' ? { visibility: 'hidden' } : {} } @@ -102,7 +121,7 @@ const Compare = ({ children, ...rest }) => { {children} @@ -122,7 +141,7 @@ Compare.propTypes = { const StickerSheet = () => { const [mode, setMode] = React.useState('Compare diffs'); const [direction, setDirection] = React.useState('row'); - + const theme = useContext(ThemeContext); const contextValue = useMemo(() => { return { mode, @@ -130,14 +149,21 @@ const StickerSheet = () => { }; }, [mode, direction]); return ( - + } /> + } actions={ // eslint-disable-next-line max-len @@ -151,9 +177,15 @@ const StickerSheet = () => { toggle /> - + - - - - - -