@aws-amplify/ui-react-native 2.2.13 → 2.2.15

package/dist/theme/createTheme.js

@@ -1,12 +1,6 @@
-import deepExtend from 'style-dictionary/lib/utils/deepExtend';
-import resolveObject from 'style-dictionary/lib/utils/resolveObject';
-import usesReference from 'style-dictionary/lib/utils/references/usesReference';
+import { deepExtend, resolveObject, usesReference } from '@aws-amplify/ui';
 import { isFunction, setupTokens } from '@aws-amplify/ui';
 import { defaultTheme } from './defaultTheme';
-// This will resolve all references in component themes by either
-// calling the component theme function with the already resolved base tokens
-// OR
-// resolving the component theme object
 const setupComponents = ({ components, tokens, }) => {
     const output = components
         ? Object.entries(components).reduce((acc, [key, value]) => ({
@@ -64,12 +58,7 @@ const setupToken = ({ token, path = [], spaceModifier, }) => {
 export const createTheme = (theme, colorMode) => {
     // merge custom `theme` param and `StrictTheme` to get the merged theme.
     // `deepExtend` is a Style Dictionary method that performs a deep merge on n objects.
-    const mergedTheme = deepExtend([
-        {},
-        defaultTheme,
-        theme,
-        // cast to `StrictTheme` as `deepExtend` returns a generic object
-    ]);
+    const mergedTheme = deepExtend([{}, defaultTheme, theme]);
     let { tokens: mergedTokens } = mergedTheme;
     const { spaceModifier = 1 } = mergedTheme;
     // We need to merge in any applicable overrides because we need to

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "2.2.13";
+export declare const VERSION = "2.2.15";

package/dist/version.js

@@ -1 +1 @@
-export const VERSION = '2.2.13';
+export const VERSION = '2.2.15';

package/lib/theme/createTheme.js

@@ -1,24 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTheme = void 0;
-const tslib_1 = require("tslib");
-const deepExtend_1 = tslib_1.__importDefault(require("style-dictionary/lib/utils/deepExtend"));
-const resolveObject_1 = tslib_1.__importDefault(require("style-dictionary/lib/utils/resolveObject"));
-const usesReference_1 = tslib_1.__importDefault(require("style-dictionary/lib/utils/references/usesReference"));
 const ui_1 = require("@aws-amplify/ui");
+const ui_2 = require("@aws-amplify/ui");
 const defaultTheme_1 = require("./defaultTheme");
-// This will resolve all references in component themes by either
-// calling the component theme function with the already resolved base tokens
-// OR
-// resolving the component theme object
 const setupComponents = ({ components, tokens, }) => {
     const output = components
         ? Object.entries(components).reduce((acc, [key, value]) => ({
             ...acc,
-            [key]: (0, ui_1.isFunction)(value) ? value(tokens) : value,
+            [key]: (0, ui_2.isFunction)(value) ? value(tokens) : value,
         }), {})
         : {};
-    return (0, resolveObject_1.default)({
+    return (0, ui_1.resolveObject)({
         ...tokens,
         components: output,
     }).components;
@@ -36,7 +29,7 @@ const setupToken = ({ token, path = [], spaceModifier, }) => {
     if (typeof value === 'string') {
         // Remove .value from references if there is a reference
         // this needs to come first so we don't get NaNs for references
-        if ((0, usesReference_1.default)(value)) {
+        if ((0, ui_1.usesReference)(value)) {
             return value.replace('.value', '');
         }
         if (shouldParseFloatValue(path[0])) {
@@ -68,12 +61,7 @@ const setupToken = ({ token, path = [], spaceModifier, }) => {
 const createTheme = (theme, colorMode) => {
     // merge custom `theme` param and `StrictTheme` to get the merged theme.
     // `deepExtend` is a Style Dictionary method that performs a deep merge on n objects.
-    const mergedTheme = (0, deepExtend_1.default)([
-        {},
-        defaultTheme_1.defaultTheme,
-        theme,
-        // cast to `StrictTheme` as `deepExtend` returns a generic object
-    ]);
+    const mergedTheme = (0, ui_1.deepExtend)([{}, defaultTheme_1.defaultTheme, theme]);
     let { tokens: mergedTokens } = mergedTheme;
     const { spaceModifier = 1 } = mergedTheme;
     // We need to merge in any applicable overrides because we need to
@@ -82,7 +70,7 @@ const createTheme = (theme, colorMode) => {
     if (theme?.overrides?.length) {
         theme.overrides.forEach((override) => {
             if (override?.colorMode === colorMode) {
-                mergedTokens = (0, deepExtend_1.default)([
+                mergedTokens = (0, ui_1.deepExtend)([
                     {},
                     mergedTokens,
                     override.tokens,
@@ -94,7 +82,7 @@ const createTheme = (theme, colorMode) => {
     // Setup the tokens:
     // - each token will have a raw value
     // - references to tokens (strings wrapped in curly braces) are replaced by raw values
-    const tokens = (0, resolveObject_1.default)((0, ui_1.setupTokens)({
+    const tokens = (0, ui_1.resolveObject)((0, ui_2.setupTokens)({
         tokens: mergedTokens,
         setupToken: ({ token, path }) => {
             return setupToken({ token, path, spaceModifier });

package/lib/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VERSION = void 0;
-exports.VERSION = '2.2.13';
+exports.VERSION = '2.2.15';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/ui-react-native",
-  "version": "2.2.13",
+  "version": "2.2.15",
   "main": "lib/index.js",
   "module": "dist/index.js",
   "react-native": "src/index.ts",
@@ -30,10 +30,9 @@
     "react-native-safe-area-context": "^4.7.3"
   },
   "dependencies": {
-    "@aws-amplify/ui": "6.6.2",
-    "@aws-amplify/ui-react-core": "3.0.26",
-    "@aws-amplify/ui-react-core-notifications": "2.0.26",
-    "style-dictionary": "3.9.1"
+    "@aws-amplify/ui": "6.6.4",
+    "@aws-amplify/ui-react-core": "3.0.28",
+    "@aws-amplify/ui-react-core-notifications": "2.0.28"
   },
   "peerDependencies": {
     "aws-amplify": "^6.6.0",

package/src/theme/createTheme.ts

@@ -1,6 +1,4 @@
-import deepExtend from 'style-dictionary/lib/utils/deepExtend';
-import resolveObject from 'style-dictionary/lib/utils/resolveObject';
-import usesReference from 'style-dictionary/lib/utils/references/usesReference';
+import { deepExtend, resolveObject, usesReference } from '@aws-amplify/ui';
 import { isFunction, setupTokens } from '@aws-amplify/ui';
 import {
   Theme,
@@ -15,13 +13,15 @@ import { defaultTheme } from './defaultTheme';
 // calling the component theme function with the already resolved base tokens
 // OR
 // resolving the component theme object
+interface TokensAndComponents {
+  components: Components;
+  tokens: StrictTokens;
+}
+
 const setupComponents = ({
   components,
   tokens,
-}: {
-  components: Components;
-  tokens: StrictTokens;
-}) => {
+}: TokensAndComponents): Components => {
   const output = components
     ? Object.entries(components).reduce(
         (acc, [key, value]) => ({
@@ -32,7 +32,7 @@ const setupComponents = ({
       )
     : {};
 
-  return resolveObject({
+  return resolveObject<TokensAndComponents>({
     ...tokens,
     components: output,
   }).components;
@@ -103,12 +103,7 @@ export const createTheme = (
 ): StrictTheme => {
   // merge custom `theme` param and `StrictTheme` to get the merged theme.
   // `deepExtend` is a Style Dictionary method that performs a deep merge on n objects.
-  const mergedTheme = deepExtend([
-    {},
-    defaultTheme,
-    theme,
-    // cast to `StrictTheme` as `deepExtend` returns a generic object
-  ]) as StrictTheme;
+  const mergedTheme = deepExtend<StrictTheme>([{}, defaultTheme, theme]);
 
   let { tokens: mergedTokens } = mergedTheme;
   const { spaceModifier = 1 } = mergedTheme;
@@ -119,11 +114,11 @@ export const createTheme = (
   if (theme?.overrides?.length) {
     theme.overrides.forEach((override) => {
       if (override?.colorMode === colorMode) {
-        mergedTokens = deepExtend([
+        mergedTokens = deepExtend<StrictTheme['tokens']>([
           {},
           mergedTokens,
           override.tokens,
-        ]) as StrictTheme['tokens'];
+        ]);
       }
       // more overrides in the future could happen here
     });
@@ -132,13 +127,13 @@ export const createTheme = (
   // Setup the tokens:
   // - each token will have a raw value
   // - references to tokens (strings wrapped in curly braces) are replaced by raw values
-  const tokens = resolveObject(
+  const tokens = resolveObject<StrictTheme['tokens']>(
     setupTokens({
       tokens: mergedTokens,
       setupToken: ({ token, path }) => {
         return setupToken({ token, path, spaceModifier });
       },
-    }) as StrictTheme['tokens']
+    })
   );
 
   let components;

package/src/version.ts

@@ -1 +1 @@
-export const VERSION = '2.2.13';
+export const VERSION = '2.2.15';