@atlaskit/app-provider 1.6.1 → 1.7.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/app-provider
 
+## 1.7.0
+
+### Minor Changes
+
+- [#105257](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/105257)
+  [`16af4057ef04e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/16af4057ef04e) -
+  Fixes a race condition with setting the theme. This change is no longer behind a feature flag.
+
 ## 1.6.1
 
 ### Patch Changes

package/dist/cjs/theme-provider.js

@@ -144,20 +144,8 @@ function ThemeProvider(_ref) {
       return _objectSpread(_objectSpread({}, theme), nextTheme);
     });
   }, []);
-  (0, _react.useEffect)(function () {
-    if ((0, _platformFeatureFlags.fg)('platform_dst_fix_set_theme_race')) {
-      return;
-    }
-    (0, _tokens.setGlobalTheme)(_objectSpread(_objectSpread({}, theme), {}, {
-      colorMode: reconciledColorMode
-    }));
-  }, [theme, reconciledColorMode]);
   var lastSetGlobalThemePromiseRef = (0, _react.useRef)(null);
   (0, _react.useEffect)(function () {
-    if (!(0, _platformFeatureFlags.fg)('platform_dst_fix_set_theme_race')) {
-      return;
-    }
-
     /**
      * We need to wait for any previous `setGlobalTheme` calls to finish before calling it again.
      * This is to prevent race conditions as `setGlobalTheme` is async and mutates the DOM (e.g. sets the

package/dist/es2019/theme-provider.js

@@ -115,21 +115,8 @@ function ThemeProvider({
       ...nextTheme
     }));
   }, []);
-  useEffect(() => {
-    if (fg('platform_dst_fix_set_theme_race')) {
-      return;
-    }
-    setGlobalTheme({
-      ...theme,
-      colorMode: reconciledColorMode
-    });
-  }, [theme, reconciledColorMode]);
   const lastSetGlobalThemePromiseRef = useRef(null);
   useEffect(() => {
-    if (!fg('platform_dst_fix_set_theme_race')) {
-      return;
-    }
-
     /**
      * We need to wait for any previous `setGlobalTheme` calls to finish before calling it again.
      * This is to prevent race conditions as `setGlobalTheme` is async and mutates the DOM (e.g. sets the

package/dist/esm/theme-provider.js

@@ -129,20 +129,8 @@ function ThemeProvider(_ref) {
       return _objectSpread(_objectSpread({}, theme), nextTheme);
     });
   }, []);
-  useEffect(function () {
-    if (fg('platform_dst_fix_set_theme_race')) {
-      return;
-    }
-    setGlobalTheme(_objectSpread(_objectSpread({}, theme), {}, {
-      colorMode: reconciledColorMode
-    }));
-  }, [theme, reconciledColorMode]);
   var lastSetGlobalThemePromiseRef = useRef(null);
   useEffect(function () {
-    if (!fg('platform_dst_fix_set_theme_race')) {
-      return;
-    }
-
     /**
      * We need to wait for any previous `setGlobalTheme` calls to finish before calling it again.
      * This is to prevent race conditions as `setGlobalTheme` is async and mutates the DOM (e.g. sets the

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/app-provider",
-	"version": "1.6.1",
+	"version": "1.7.0",
 	"description": "A top level provider for the Design System.",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -40,7 +40,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/tokens": "^3.1.0",
+		"@atlaskit/tokens": "^3.2.0",
 		"@babel/runtime": "^7.0.0",
 		"bind-event-listener": "^3.0.0"
 	},
@@ -49,7 +49,7 @@
 	},
 	"devDependencies": {
 		"@af/visual-regression": "*",
-		"@atlaskit/dropdown-menu": "^12.24.1",
+		"@atlaskit/dropdown-menu": "^12.25.0",
 		"@atlaskit/ds-lib": "^3.3.0",
 		"@atlaskit/primitives": "^13.3.7",
 		"@atlaskit/ssr": "*",
@@ -93,9 +93,6 @@
 	},
 	"homepage": "https://atlassian.design/components/app-provider",
 	"platform-feature-flags": {
-		"platform_dst_fix_set_theme_race": {
-			"type": "boolean"
-		},
 		"platform-default-typography-modernized": {
 			"type": "boolean"
 		}