@jobber/components-native 0.114.7 → 0.114.9

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jobber/components-native",
-    "version": "0.114.7",
+    "version": "0.114.9",
     "license": "MIT",
     "description": "React Native implementation of Atlantis",
     "repository": {
@@ -73,7 +73,7 @@
     "devDependencies": {
         "@babel/runtime": "^7.29.2",
         "@gorhom/bottom-sheet": "^5.2.8",
-        "@jobber/design": "0.117.0",
+        "@jobber/design": "0.117.1",
         "@jobber/hooks": "2.21.1",
         "@react-native-community/datetimepicker": "^8.4.5",
         "@react-native/babel-preset": "^0.82.1",
@@ -123,5 +123,5 @@
         "react-native-screens": ">=4.18.0",
         "react-native-svg": ">=12.0.0"
     },
-    "gitHead": "96774b47d51dfa7778ca1958ef0fe46cfd5099cf"
+    "gitHead": "03a318392b77ae6bb66564ec8bc82416f0cb8da7"
 }

package/dist/src/AtlantisThemeContext/AtlantisThemeContext.js

@@ -1,13 +1,18 @@
 import { androidTokens, darkTokens, iosTokens } from "@jobber/design";
 import React, { createContext, useCallback, useContext, useState } from "react";
-import merge from "lodash/merge";
+import mergeWith from "lodash/mergeWith";
 import { Platform, useColorScheme } from "react-native";
 const lightTokens = Platform.select({
     ios: () => iosTokens,
     android: () => androidTokens,
     default: () => androidTokens,
 })();
-const completeDarkTokens = merge({}, lightTokens, darkTokens);
+const completeDarkTokens = mergeWith({}, lightTokens, darkTokens, (platformValue, darkValue) => {
+    const platformValueIsObject = typeof platformValue === "object" && platformValue !== null;
+    const darkValueIsObject = typeof darkValue === "object" && darkValue !== null;
+    if (platformValueIsObject && !darkValueIsObject)
+        return platformValue;
+});
 const defaultAtlantisThemeContextValue = {
     theme: "light",
     effectiveTheme: "light",

package/dist/src/AtlantisThemeContext/AtlantisThemeContext.test.js

@@ -21,7 +21,7 @@ jest.mock("react-native", () => {
     });
     return actual;
 });
-const expectedDarkTokens = merge({}, iosTokens, darkTokens);
+const expectedDarkTokens = Object.assign(Object.assign({}, merge({}, iosTokens, darkTokens)), { "shadow-low": iosTokens["shadow-low"], "shadow-base": iosTokens["shadow-base"], "shadow-high": iosTokens["shadow-high"] });
 const expectedLightTokens = iosTokens;
 const mockUseColorScheme = useColorScheme;
 function Wrapper({ children, theme, onThemeChange, dangerouslyOverrideTheme, }) {
@@ -56,6 +56,14 @@ describe("ThemeContext", () => {
         expect(result.current.effectiveTheme).toBe("light");
         expect(result.current.tokens).toEqual(expectedLightTokens);
     }));
+    it.each(["shadow-low", "shadow-base", "shadow-high"])("keeps the platform-native %s token in dark mode", (shadowToken) => __awaiter(void 0, void 0, void 0, function* () {
+        const { result } = renderHook(useAtlantisTheme, {
+            wrapper: (props) => (React.createElement(Wrapper, Object.assign({}, props))),
+        });
+        yield act(() => __awaiter(void 0, void 0, void 0, function* () { return result.current.setTheme("dark"); }));
+        expect(result.current.tokens[shadowToken]).toEqual(iosTokens[shadowToken]);
+        expect(typeof result.current.tokens[shadowToken]).toBe("object");
+    }));
     it("resolves the system theme from the OS color scheme", () => __awaiter(void 0, void 0, void 0, function* () {
         mockUseColorScheme.mockReturnValue("dark");
         const { result, rerender } = renderHook(useAtlantisTheme, {