@atlaskit/tokens 1.24.0 → 1.25.0

package/dist/es2019/get-theme-styles.js

@@ -1,6 +1,6 @@
 import { themeIdsWithOverrides, themeStateDefaults } from './theme-config';
 import { isValidBrandHex } from './utils/color-utils';
-import { getThemePreferences } from './utils/get-theme-preferences';
+import { getThemeOverridePreferences, getThemePreferences } from './utils/get-theme-preferences';
 import { loadThemeCss } from './utils/theme-loading';
 /**
  * Takes an object containing theme preferences, and returns an array of objects for use in applying styles to the document head.
@@ -20,19 +20,22 @@ import { loadThemeCss } from './utils/theme-loading';
  */
 const getThemeStyles = async preferences => {
   let themePreferences;
+  let themeOverridePreferences = [];
   if (preferences === 'all') {
     themePreferences = themeIdsWithOverrides;
   } else {
-    themePreferences = getThemePreferences({
+    const themeState = {
       colorMode: (preferences === null || preferences === void 0 ? void 0 : preferences.colorMode) || themeStateDefaults['colorMode'],
       dark: (preferences === null || preferences === void 0 ? void 0 : preferences.dark) || themeStateDefaults['dark'],
       light: (preferences === null || preferences === void 0 ? void 0 : preferences.light) || themeStateDefaults['light'],
       shape: (preferences === null || preferences === void 0 ? void 0 : preferences.shape) || themeStateDefaults['shape'],
       spacing: (preferences === null || preferences === void 0 ? void 0 : preferences.spacing) || themeStateDefaults['spacing'],
       typography: (preferences === null || preferences === void 0 ? void 0 : preferences.typography) || themeStateDefaults['typography']
-    });
+    };
+    themePreferences = getThemePreferences(themeState);
+    themeOverridePreferences = getThemeOverridePreferences(themeState);
   }
-  const results = await Promise.all([...themePreferences.map(async themeId => {
+  const results = await Promise.all([...[...themePreferences, ...themeOverridePreferences].map(async themeId => {
     try {
       const css = await loadThemeCss(themeId);
       return {

package/dist/es2019/get-token-value.js

@@ -1,7 +1,7 @@
 import warnOnce from '@atlaskit/ds-lib/warn-once';
 import tokens from './artifacts/token-names';
 const name = "@atlaskit/tokens";
-const version = "1.24.0";
+const version = "1.25.0";
 /**
  * Takes a dot-separated token name and and an optional fallback, and returns the current computed CSS value for the
  * resulting CSS Custom Property.

package/dist/es2019/get-token.js

@@ -2,7 +2,7 @@ import warnOnce from '@atlaskit/ds-lib/warn-once';
 import tokens from './artifacts/token-names';
 import { TOKEN_NOT_FOUND_CSS_VAR } from './constants';
 const name = "@atlaskit/tokens";
-const version = "1.24.0";
+const version = "1.25.0";
 /**
  * Takes a dot-separated token name and an optional fallback, and returns the CSS custom property for the corresponding token.
  * This should be used to implement design decisions throughout your application.

package/dist/es2019/palettes/updated-saturated-palette.js

@@ -0,0 +1,312 @@
+import defaultPalette from './palette';
+
+/**
+ * Simple object check.
+ * @param item
+ * @returns {boolean}
+ */
+export function isObject(item) {
+  return item && typeof item === 'object' && !Array.isArray(item);
+}
+
+/**
+ * Deep merge two objects.
+ * @param target
+ * @param ...sources
+ */
+function mergeDeep(target, ...sources) {
+  if (!sources.length) {
+    return target;
+  }
+  const source = sources.shift();
+  if (isObject(target) && isObject(source)) {
+    for (const key in source) {
+      if (isObject(source[key])) {
+        if (!target[key]) {
+          Object.assign(target, {
+            [key]: {}
+          });
+        }
+        mergeDeep(target[key], source[key]);
+      } else {
+        Object.assign(target, {
+          [key]: source[key]
+        });
+      }
+    }
+  }
+  return mergeDeep(target, ...sources);
+}
+const palette = mergeDeep(JSON.parse(JSON.stringify(defaultPalette)), {
+  color: {
+    palette: {
+      Blue1000: {
+        value: '#1C2B41',
+        attributes: {
+          group: 'palette',
+          category: 'blue'
+        }
+      },
+      Red100: {
+        value: '#FFECEB',
+        attributes: {
+          group: 'palette',
+          category: 'red'
+        }
+      },
+      Red200: {
+        value: '#FFD5D2',
+        attributes: {
+          group: 'palette',
+          category: 'red'
+        }
+      },
+      Red300: {
+        value: '#FD9891',
+        attributes: {
+          group: 'palette',
+          category: 'red'
+        }
+      },
+      Red400: {
+        value: '#F87168',
+        attributes: {
+          group: 'palette',
+          category: 'red'
+        }
+      },
+      Red500: {
+        value: '#F15B50',
+        attributes: {
+          group: 'palette',
+          category: 'red'
+        }
+      },
+      Red600: {
+        value: '#E2483D',
+        attributes: {
+          group: 'palette',
+          category: 'red'
+        }
+      },
+      Red700: {
+        value: '#C9372C',
+        attributes: {
+          group: 'palette',
+          category: 'red'
+        }
+      },
+      Red800: {
+        value: '#AE2E24',
+        attributes: {
+          group: 'palette',
+          category: 'red'
+        }
+      },
+      Red900: {
+        value: '#5D1F1A',
+        attributes: {
+          group: 'palette',
+          category: 'red'
+        }
+      },
+      Red1000: {
+        value: '#42221F',
+        attributes: {
+          group: 'palette',
+          category: 'red'
+        }
+      },
+      Yellow1000: {
+        value: '#332E1B',
+        attributes: {
+          group: 'palette',
+          category: 'yellow'
+        }
+      },
+      Green100: {
+        value: '#DCFFF1',
+        attributes: {
+          group: 'palette',
+          category: 'green'
+        }
+      },
+      Green1000: {
+        value: '#1C3329',
+        attributes: {
+          group: 'palette',
+          category: 'green'
+        }
+      },
+      Purple1000: {
+        value: '#2B273F',
+        attributes: {
+          group: 'palette',
+          category: 'purple'
+        }
+      },
+      Teal100: {
+        value: '#E7F9FF',
+        attributes: {
+          group: 'palette',
+          category: 'teal'
+        }
+      },
+      Teal200: {
+        value: '#C6EDFB',
+        attributes: {
+          group: 'palette',
+          category: 'teal'
+        }
+      },
+      Teal300: {
+        value: '#9DD9EE',
+        attributes: {
+          group: 'palette',
+          category: 'teal'
+        }
+      },
+      Teal400: {
+        value: '#6CC3E0',
+        attributes: {
+          group: 'palette',
+          category: 'teal'
+        }
+      },
+      Teal500: {
+        value: '#42B2D7',
+        attributes: {
+          group: 'palette',
+          category: 'teal'
+        }
+      },
+      Teal600: {
+        value: '#2898BD',
+        attributes: {
+          group: 'palette',
+          category: 'teal'
+        }
+      },
+      Teal700: {
+        value: '#227D9B',
+        attributes: {
+          group: 'palette',
+          category: 'teal'
+        }
+      },
+      Teal800: {
+        value: '#206A83',
+        attributes: {
+          group: 'palette',
+          category: 'teal'
+        }
+      },
+      Teal900: {
+        value: '#164555',
+        attributes: {
+          group: 'palette',
+          category: 'teal'
+        }
+      },
+      Teal1000: {
+        value: '#1E3137',
+        attributes: {
+          group: 'palette',
+          category: 'teal'
+        }
+      },
+      Orange100: {
+        value: '#FFF3EB',
+        attributes: {
+          group: 'palette',
+          category: 'orange'
+        }
+      },
+      Orange200: {
+        value: '#FEDEC8',
+        attributes: {
+          group: 'palette',
+          category: 'orange'
+        }
+      },
+      Orange300: {
+        value: '#FEC195',
+        attributes: {
+          group: 'palette',
+          category: 'orange'
+        }
+      },
+      Orange400: {
+        value: '#FEA362',
+        attributes: {
+          group: 'palette',
+          category: 'orange'
+        }
+      },
+      Orange500: {
+        value: '#F38A3F',
+        attributes: {
+          group: 'palette',
+          category: 'orange'
+        }
+      },
+      Orange600: {
+        value: '#E56910',
+        attributes: {
+          group: 'palette',
+          category: 'orange'
+        }
+      },
+      Orange700: {
+        value: '#C25100',
+        attributes: {
+          group: 'palette',
+          category: 'orange'
+        }
+      },
+      Orange800: {
+        value: '#A54800',
+        attributes: {
+          group: 'palette',
+          category: 'orange'
+        }
+      },
+      Orange900: {
+        value: '#702E00',
+        attributes: {
+          group: 'palette',
+          category: 'orange'
+        }
+      },
+      Orange1000: {
+        value: '#38291E',
+        attributes: {
+          group: 'palette',
+          category: 'orange'
+        }
+      },
+      Magenta1000: {
+        value: '#3D2232',
+        attributes: {
+          group: 'palette',
+          category: 'magenta'
+        }
+      },
+      Lime100: {
+        value: '#EFFFD6',
+        attributes: {
+          group: 'palette',
+          category: 'lime'
+        }
+      },
+      Lime1000: {
+        value: '#28311B',
+        attributes: {
+          group: 'palette',
+          category: 'lime'
+        }
+      }
+    }
+  }
+});
+export default palette;

package/dist/es2019/set-global-theme.js

@@ -2,7 +2,7 @@ import { themeStateDefaults } from './theme-config';
 import { isValidBrandHex } from './utils/color-utils';
 import configurePage from './utils/configure-page';
 import { findMissingCustomStyleElements } from './utils/custom-theme-loading-utils';
-import { getThemePreferences } from './utils/get-theme-preferences';
+import { getThemeOverridePreferences, getThemePreferences } from './utils/get-theme-preferences';
 import { loadAndAppendThemeCss } from './utils/theme-loading';
 
 /**
@@ -45,7 +45,7 @@ const setGlobalTheme = async ({
   };
 
   // Determine what to load and loading strategy
-  const themePreferences = getThemePreferences(themeState);
+  let themePreferences = getThemePreferences(themeState);
   const loadingStrategy = themeLoader ? themeLoader : loadAndAppendThemeCss;
 
   // Load standard themes
@@ -72,6 +72,12 @@ const setGlobalTheme = async ({
     }
   }
   await Promise.all(loadingTasks);
+
+  // Load override themes after standard themes
+  const themeOverridePreferences = getThemeOverridePreferences(themeState);
+  for (const themeId of themeOverridePreferences) {
+    await loadingStrategy(themeId);
+  }
   const autoUnbind = configurePage(themeState);
   return autoUnbind;
 };

package/dist/es2019/theme-config.js

@@ -39,7 +39,7 @@ export const themeIds = ['light', 'dark', 'legacy-light', 'legacy-dark', 'spacin
  * Theme override ids: the equivalent of themeIds for theme overrides.
  * Theme overrides are temporary and there may not be any defined at times.
  */
-export const themeOverrideIds = ['light-new-input-border', 'dark-new-input-border'];
+export const themeOverrideIds = ['light-new-input-border', 'dark-new-input-border', 'light-saturated-palette-changes', 'dark-saturated-palette-changes'];
 export const themeIdsWithOverrides = [...themeIds, ...themeOverrideIds];
 
 /**
@@ -140,6 +140,30 @@ const themeConfig = {
       mode: 'dark'
     }
   },
+  'atlassian-light-saturated-palette-changes': {
+    id: 'light-saturated-palette-changes',
+    displayName: 'Light Theme Saturated Palette Change',
+    palette: 'updatedSaturatedPalette',
+    override: 'light',
+    extends: 'light',
+    attributes: {
+      type: 'color',
+      mode: 'light',
+      extends: 'light'
+    }
+  },
+  'atlassian-dark-saturated-palette-changes': {
+    id: 'dark-saturated-palette-changes',
+    displayName: 'Dark Theme Saturated Palette Change',
+    palette: 'updatedSaturatedPalette',
+    override: 'dark',
+    extends: 'dark',
+    attributes: {
+      type: 'color',
+      mode: 'dark',
+      extends: 'dark'
+    }
+  },
   'atlassian-typography': {
     id: 'typography',
     displayName: 'Atlassian Typography (Minor Second)',

package/dist/es2019/tokens/atlassian-dark-saturated-palette-changes/color/accent.js

@@ -0,0 +1,15 @@
+const color = {
+  color: {
+    icon: {
+      accent: {
+        red: {
+          value: 'Red600'
+        },
+        yellow: {
+          value: 'Yellow300'
+        }
+      }
+    }
+  }
+};
+export default color;

package/dist/es2019/tokens/atlassian-dark-saturated-palette-changes/color/background.js

@@ -0,0 +1,20 @@
+const color = {
+  color: {
+    background: {
+      warning: {
+        bold: {
+          '[default]': {
+            value: 'Yellow300'
+          },
+          hovered: {
+            value: 'Yellow400'
+          },
+          pressed: {
+            value: 'Yellow500'
+          }
+        }
+      }
+    }
+  }
+};
+export default color;

package/dist/es2019/tokens/atlassian-dark-saturated-palette-changes/color/icon.js

@@ -0,0 +1,12 @@
+const color = {
+  color: {
+    icon: {
+      warning: {
+        '[default]': {
+          value: 'Yellow300'
+        }
+      }
+    }
+  }
+};
+export default color;

package/dist/es2019/tokens/atlassian-light-saturated-palette-changes/color/accent.js

@@ -0,0 +1,29 @@
+const color = {
+  color: {
+    icon: {
+      accent: {
+        red: {
+          value: 'Red700'
+        }
+      }
+    },
+    background: {
+      accent: {
+        yellow: {
+          subtle: {
+            '[default]': {
+              value: 'Yellow300'
+            },
+            hovered: {
+              value: 'Yellow400'
+            },
+            pressed: {
+              value: 'Yellow500'
+            }
+          }
+        }
+      }
+    }
+  }
+};
+export default color;

package/dist/es2019/tokens/atlassian-light-saturated-palette-changes/color/background.js

@@ -0,0 +1,20 @@
+const color = {
+  color: {
+    background: {
+      warning: {
+        bold: {
+          '[default]': {
+            value: 'Yellow300'
+          },
+          hovered: {
+            value: 'Yellow400'
+          },
+          pressed: {
+            value: 'Yellow500'
+          }
+        }
+      }
+    }
+  }
+};
+export default color;

package/dist/es2019/tokens/atlassian-light-saturated-palette-changes/color/icon.js

@@ -0,0 +1,10 @@
+const color = {
+  color: {
+    icon: {
+      danger: {
+        value: 'Red700'
+      }
+    }
+  }
+};
+export default color;

package/dist/es2019/utils/get-theme-preferences.js

@@ -9,13 +9,37 @@ export const getThemePreferences = themeState => {
     typography
   } = themeState;
   const themePreferences = colorMode === 'auto' ? [light, dark] : [themeState[colorMode]];
+
+  // Replace light/dark theme with new palette if feature flag is on
+  if (getBooleanFF('platform.design-system-team.saturated-palette-changes_asoro')) {
+    // Iterate over themePreferences and swap out light/dark with new palette
+    themePreferences.forEach((themeId, index) => {
+      if (themeId === 'light') {
+        themePreferences[index] = 'light-saturated-palette-changes';
+      }
+      if (themeId === 'dark') {
+        themePreferences[index] = 'dark-saturated-palette-changes';
+      }
+    });
+  }
   [shape, spacing, typography].forEach(themeId => {
     if (themeId) {
       themePreferences.push(themeId);
     }
   });
+  return [...new Set(themePreferences)];
+};
+export const getThemeOverridePreferences = themeState => {
+  const {
+    colorMode,
+    dark,
+    light
+  } = themeState;
+  const themeOverridePreferences = [];
+  const themePreferences = colorMode === 'auto' ? [light, dark] : [themeState[colorMode]];
   if (getBooleanFF('platform.design-system-team.border-checkbox_nyoiu')) {
-    themePreferences.push(`${themePreferences.includes('dark') ? 'dark' : 'light'}-new-input-border`);
+    themePreferences.includes('light') && themeOverridePreferences.push('light-new-input-border');
+    themePreferences.includes('dark') && themeOverridePreferences.push('dark-new-input-border');
   }
-  return [...new Set(themePreferences)];
+  return [...new Set(themeOverridePreferences)];
 };