@atlaskit/app-provider 3.0.0 → 3.1.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/app-provider
 
+## 3.1.0
+
+### Minor Changes
+
+- [`33a9e5805e0c7`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/33a9e5805e0c7) -
+  Adds fallback logic for requesting the colorMode from the `useColorMode()` hook. Also fixes
+  `useTheme()` so that `colorMode` isn't returned when its fallback logic is used
+
 ## 3.0.0
 
 ### Major Changes

package/dist/cjs/theme-provider.js

@@ -53,10 +53,26 @@ function UNSAFE_useColorModeForMigration() {
  */
 function useColorMode() {
   var value = (0, _react.useContext)(ColorModeContext);
-  if (!value) {
-    throw new Error('useColorMode must be used within AppProvider.');
-  }
-  return value;
+  var _getGlobalTheme = (0, _tokens.getGlobalTheme)(),
+    colorMode = _getGlobalTheme.colorMode;
+  var _useState = (0, _react.useState)(colorMode || 'light'),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    resolvedColorMode = _useState2[0],
+    setResolvedColorMode = _useState2[1];
+  (0, _react.useEffect)(function () {
+    // We are using theme from context so no need to reference the DOM
+    if (value) {
+      return;
+    }
+    var observer = new _tokens.ThemeMutationObserver(function (theme) {
+      setResolvedColorMode(theme.colorMode || 'light');
+    });
+    observer.observe();
+    return function () {
+      return observer.disconnect();
+    };
+  }, [value]);
+  return value ? value : resolvedColorMode;
 }
 
 /**
@@ -79,10 +95,10 @@ function useSetColorMode() {
  */
 function useTheme() {
   var theme = (0, _react.useContext)(ThemeContext);
-  var _useState = (0, _react.useState)(theme || (0, _tokens.getGlobalTheme)()),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    resolvedTheme = _useState2[0],
-    setResolvedTheme = _useState2[1];
+  var _useState3 = (0, _react.useState)(theme || (0, _tokens.getGlobalTheme)()),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    resolvedTheme = _useState4[0],
+    setResolvedTheme = _useState4[1];
   (0, _react.useEffect)(function () {
     // We are using theme from context so no need to reference the DOM
     if (theme) {
@@ -94,7 +110,7 @@ function useTheme() {
       return observer.disconnect();
     };
   }, [theme]);
-  return resolvedTheme;
+  return theme ? theme : resolvedTheme;
 }
 
 /**
@@ -131,20 +147,20 @@ function ThemeProvider(_ref) {
   var children = _ref.children,
     defaultColorMode = _ref.defaultColorMode,
     defaultTheme = _ref.defaultTheme;
-  var _useState3 = (0, _react.useState)(defaultColorMode),
-    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    chosenColorMode = _useState4[0],
-    setChosenColorMode = _useState4[1];
-  var _useState5 = (0, _react.useState)(getReconciledColorMode(defaultColorMode)),
+  var _useState5 = (0, _react.useState)(defaultColorMode),
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-    reconciledColorMode = _useState6[0],
-    setReconciledColorMode = _useState6[1];
-  var _useState7 = (0, _react.useState)(function () {
+    chosenColorMode = _useState6[0],
+    setChosenColorMode = _useState6[1];
+  var _useState7 = (0, _react.useState)(getReconciledColorMode(defaultColorMode)),
+    _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
+    reconciledColorMode = _useState8[0],
+    setReconciledColorMode = _useState8[1];
+  var _useState9 = (0, _react.useState)(function () {
       return _objectSpread(_objectSpread({}, defaultThemeSettings()), defaultTheme);
     }),
-    _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
-    theme = _useState8[0],
-    setTheme = _useState8[1];
+    _useState0 = (0, _slicedToArray2.default)(_useState9, 2),
+    theme = _useState0[0],
+    setTheme = _useState0[1];
   var setColorMode = (0, _react.useCallback)(function (colorMode) {
     setChosenColorMode(colorMode);
     setReconciledColorMode(getReconciledColorMode(colorMode));

package/dist/es2019/theme-provider.js

@@ -31,10 +31,22 @@ export function UNSAFE_useColorModeForMigration() {
  */
 export function useColorMode() {
   const value = useContext(ColorModeContext);
-  if (!value) {
-    throw new Error('useColorMode must be used within AppProvider.');
-  }
-  return value;
+  const {
+    colorMode
+  } = getGlobalTheme();
+  const [resolvedColorMode, setResolvedColorMode] = useState(colorMode || 'light');
+  useEffect(() => {
+    // We are using theme from context so no need to reference the DOM
+    if (value) {
+      return;
+    }
+    const observer = new ThemeMutationObserver(theme => {
+      setResolvedColorMode(theme.colorMode || 'light');
+    });
+    observer.observe();
+    return () => observer.disconnect();
+  }, [value]);
+  return value ? value : resolvedColorMode;
 }
 
 /**
@@ -67,7 +79,7 @@ export function useTheme() {
     observer.observe();
     return () => observer.disconnect();
   }, [theme]);
-  return resolvedTheme;
+  return theme ? theme : resolvedTheme;
 }
 
 /**

package/dist/esm/theme-provider.js

@@ -39,10 +39,26 @@ export function UNSAFE_useColorModeForMigration() {
  */
 export function useColorMode() {
   var value = useContext(ColorModeContext);
-  if (!value) {
-    throw new Error('useColorMode must be used within AppProvider.');
-  }
-  return value;
+  var _getGlobalTheme = getGlobalTheme(),
+    colorMode = _getGlobalTheme.colorMode;
+  var _useState = useState(colorMode || 'light'),
+    _useState2 = _slicedToArray(_useState, 2),
+    resolvedColorMode = _useState2[0],
+    setResolvedColorMode = _useState2[1];
+  useEffect(function () {
+    // We are using theme from context so no need to reference the DOM
+    if (value) {
+      return;
+    }
+    var observer = new ThemeMutationObserver(function (theme) {
+      setResolvedColorMode(theme.colorMode || 'light');
+    });
+    observer.observe();
+    return function () {
+      return observer.disconnect();
+    };
+  }, [value]);
+  return value ? value : resolvedColorMode;
 }
 
 /**
@@ -65,10 +81,10 @@ export function useSetColorMode() {
  */
 export function useTheme() {
   var theme = useContext(ThemeContext);
-  var _useState = useState(theme || getGlobalTheme()),
-    _useState2 = _slicedToArray(_useState, 2),
-    resolvedTheme = _useState2[0],
-    setResolvedTheme = _useState2[1];
+  var _useState3 = useState(theme || getGlobalTheme()),
+    _useState4 = _slicedToArray(_useState3, 2),
+    resolvedTheme = _useState4[0],
+    setResolvedTheme = _useState4[1];
   useEffect(function () {
     // We are using theme from context so no need to reference the DOM
     if (theme) {
@@ -80,7 +96,7 @@ export function useTheme() {
       return observer.disconnect();
     };
   }, [theme]);
-  return resolvedTheme;
+  return theme ? theme : resolvedTheme;
 }
 
 /**
@@ -117,20 +133,20 @@ function ThemeProvider(_ref) {
   var children = _ref.children,
     defaultColorMode = _ref.defaultColorMode,
     defaultTheme = _ref.defaultTheme;
-  var _useState3 = useState(defaultColorMode),
-    _useState4 = _slicedToArray(_useState3, 2),
-    chosenColorMode = _useState4[0],
-    setChosenColorMode = _useState4[1];
-  var _useState5 = useState(getReconciledColorMode(defaultColorMode)),
+  var _useState5 = useState(defaultColorMode),
     _useState6 = _slicedToArray(_useState5, 2),
-    reconciledColorMode = _useState6[0],
-    setReconciledColorMode = _useState6[1];
-  var _useState7 = useState(function () {
+    chosenColorMode = _useState6[0],
+    setChosenColorMode = _useState6[1];
+  var _useState7 = useState(getReconciledColorMode(defaultColorMode)),
+    _useState8 = _slicedToArray(_useState7, 2),
+    reconciledColorMode = _useState8[0],
+    setReconciledColorMode = _useState8[1];
+  var _useState9 = useState(function () {
       return _objectSpread(_objectSpread({}, defaultThemeSettings()), defaultTheme);
     }),
-    _useState8 = _slicedToArray(_useState7, 2),
-    theme = _useState8[0],
-    setTheme = _useState8[1];
+    _useState0 = _slicedToArray(_useState9, 2),
+    theme = _useState0[0],
+    setTheme = _useState0[1];
   var setColorMode = useCallback(function (colorMode) {
     setChosenColorMode(colorMode);
     setReconciledColorMode(getReconciledColorMode(colorMode));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/app-provider",
-	"version": "3.0.0",
+	"version": "3.1.0",
 	"description": "A top level provider for the Design System.",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -55,8 +55,7 @@
 		"@testing-library/react": "^13.4.0",
 		"@testing-library/user-event": "^14.4.3",
 		"react-dom": "^18.2.0",
-		"react-resource-router": "^0.20.0",
-		"typescript": "~5.4.2"
+		"react-resource-router": "^0.20.0"
 	},
 	"techstack": {
 		"@atlassian/frontend": {