@atlaskit/app-provider 3.3.0 → 3.3.2

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/app-provider
 
+## 3.3.2
+
+### Patch Changes
+
+- Updated dependencies
+
+## 3.3.1
+
+### Patch Changes
+
+- [`d9d9cbc1507f6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/d9d9cbc1507f6) -
+  Internal change how default theme settings are shared between `@atlaskit/tokens` and
+  `@atlaskit/app-provider`.
+- Updated dependencies
+
 ## 3.3.0
 
 ### Minor Changes

package/dist/cjs/theme-provider/index.js

@@ -178,13 +178,7 @@ function ThemeProvider(_ref) {
     } else {
       // For other theme providers (whether outside AppProvider or nested inside a ThemeProvider),
       // we treat them as sub-tree themes that do not load global theme state.
-      var themeState = _objectSpread(_objectSpread({}, theme), {}, {
-        colorMode: reconciledColorMode,
-        contrastMode: _tokens.themeStateDefaults.contrastMode,
-        shape: _tokens.themeStateDefaults.shape(),
-        typography: _tokens.themeStateDefaults.typography()
-      });
-      (0, _loadAndMountThemes.loadAndMountThemes)(themeState);
+      (0, _loadAndMountThemes.loadAndMountThemes)(theme);
     }
   }, [isInsideAppProvider, isInsideThemeProvider, isRootThemeProvider, reconciledColorMode, theme]);
   (0, _react.useEffect)(function () {

package/dist/cjs/theme-provider/utils/load-and-mount-themes.js

@@ -109,12 +109,12 @@ var loadAndMountThemeCss = /*#__PURE__*/function () {
   };
 }();
 var loadAndMountThemes = exports.loadAndMountThemes = /*#__PURE__*/function () {
-  var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(themeState) {
+  var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(theme) {
     var themesToLoad;
     return _regenerator.default.wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
-          themesToLoad = [themeState.light, themeState.dark, themeState.spacing, themeState.shape, themeState.typography].filter(function (themeId) {
+          themesToLoad = Object.values(theme).filter(function (themeId) {
             return !!themeId;
           });
           themesToLoad.forEach(loadAndMountThemeCss);

package/dist/es2019/theme-provider/index.js

@@ -5,7 +5,7 @@ import { ax, ix } from "@compiled/react/runtime";
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { bind } from 'bind-event-listener';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { getThemeHtmlAttrs, setGlobalTheme, SUBTREE_THEME_ATTRIBUTE, themeStateDefaults } from '@atlaskit/tokens';
+import { getThemeHtmlAttrs, setGlobalTheme, SUBTREE_THEME_ATTRIBUTE } from '@atlaskit/tokens';
 import { useIsInsideAppProvider } from '../context';
 import { ColorModeContext, SetColorModeContext } from './context/color-mode';
 import { InsideThemeProviderContext } from './context/inside-theme-provider';
@@ -122,14 +122,7 @@ function ThemeProvider({
     } else {
       // For other theme providers (whether outside AppProvider or nested inside a ThemeProvider),
       // we treat them as sub-tree themes that do not load global theme state.
-      const themeState = {
-        ...theme,
-        colorMode: reconciledColorMode,
-        contrastMode: themeStateDefaults.contrastMode,
-        shape: themeStateDefaults.shape(),
-        typography: themeStateDefaults.typography()
-      };
-      loadAndMountThemes(themeState);
+      loadAndMountThemes(theme);
     }
   }, [isInsideAppProvider, isInsideThemeProvider, isRootThemeProvider, reconciledColorMode, theme]);
   useEffect(() => {

package/dist/es2019/theme-provider/utils/load-and-mount-themes.js

@@ -41,7 +41,7 @@ const loadAndMountThemeCss = async themeId => {
   }
   mountThemeCss(themeCss, themeId);
 };
-export const loadAndMountThemes = async themeState => {
-  const themesToLoad = [themeState.light, themeState.dark, themeState.spacing, themeState.shape, themeState.typography].filter(themeId => !!themeId);
+export const loadAndMountThemes = async theme => {
+  const themesToLoad = Object.values(theme).filter(themeId => !!themeId);
   themesToLoad.forEach(loadAndMountThemeCss);
 };

package/dist/esm/theme-provider/index.js

@@ -11,7 +11,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { bind } from 'bind-event-listener';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { getThemeHtmlAttrs, setGlobalTheme, SUBTREE_THEME_ATTRIBUTE, themeStateDefaults } from '@atlaskit/tokens';
+import { getThemeHtmlAttrs, setGlobalTheme, SUBTREE_THEME_ATTRIBUTE } from '@atlaskit/tokens';
 import { useIsInsideAppProvider } from '../context';
 import { ColorModeContext, SetColorModeContext } from './context/color-mode';
 import { InsideThemeProviderContext } from './context/inside-theme-provider';
@@ -169,13 +169,7 @@ function ThemeProvider(_ref) {
     } else {
       // For other theme providers (whether outside AppProvider or nested inside a ThemeProvider),
       // we treat them as sub-tree themes that do not load global theme state.
-      var themeState = _objectSpread(_objectSpread({}, theme), {}, {
-        colorMode: reconciledColorMode,
-        contrastMode: themeStateDefaults.contrastMode,
-        shape: themeStateDefaults.shape(),
-        typography: themeStateDefaults.typography()
-      });
-      loadAndMountThemes(themeState);
+      loadAndMountThemes(theme);
     }
   }, [isInsideAppProvider, isInsideThemeProvider, isRootThemeProvider, reconciledColorMode, theme]);
   useEffect(function () {

package/dist/esm/theme-provider/utils/load-and-mount-themes.js

@@ -102,12 +102,12 @@ var loadAndMountThemeCss = /*#__PURE__*/function () {
   };
 }();
 export var loadAndMountThemes = /*#__PURE__*/function () {
-  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(themeState) {
+  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(theme) {
     var themesToLoad;
     return _regeneratorRuntime.wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
-          themesToLoad = [themeState.light, themeState.dark, themeState.spacing, themeState.shape, themeState.typography].filter(function (themeId) {
+          themesToLoad = Object.values(theme).filter(function (themeId) {
             return !!themeId;
           });
           themesToLoad.forEach(loadAndMountThemeCss);

package/dist/types/theme-provider/utils/load-and-mount-themes.d.ts

@@ -1,2 +1,2 @@
-import { type ThemeState } from '@atlaskit/tokens';
-export declare const loadAndMountThemes: (themeState: Partial<ThemeState>) => Promise<void>;
+import { type Theme } from '../context/theme';
+export declare const loadAndMountThemes: (theme: Partial<Theme>) => Promise<void>;

package/dist/types-ts4.5/theme-provider/utils/load-and-mount-themes.d.ts

@@ -1,2 +1,2 @@
-import { type ThemeState } from '@atlaskit/tokens';
-export declare const loadAndMountThemes: (themeState: Partial<ThemeState>) => Promise<void>;
+import { type Theme } from '../context/theme';
+export declare const loadAndMountThemes: (theme: Partial<Theme>) => Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/app-provider",
-	"version": "3.3.0",
+	"version": "3.3.2",
 	"description": "A top level provider for the Design System.",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -38,7 +38,7 @@
 		"@atlaskit/browser-apis": "^0.0.1",
 		"@atlaskit/css": "^0.19.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/tokens": "^9.1.0",
+		"@atlaskit/tokens": "^10.0.0",
 		"@babel/runtime": "^7.0.0",
 		"bind-event-listener": "^3.0.0"
 	},
@@ -48,7 +48,7 @@
 	"devDependencies": {
 		"@af/visual-regression": "workspace:^",
 		"@atlaskit/dropdown-menu": "^16.4.0",
-		"@atlaskit/primitives": "^17.0.0",
+		"@atlaskit/primitives": "^17.1.0",
 		"@atlassian/feature-flags-test-utils": "^1.0.0",
 		"@atlassian/ssr-tests": "workspace:^",
 		"@testing-library/react": "^16.3.0",