@elliemae/ds-system 2.2.0-next.4 → 2.2.0-next.8

package/cjs/styled/index.js

@@ -32,9 +32,8 @@ const styledFunction = function (tag) {
     slot: null
   };
   const {
-    name: componentName,
-    slot: componentSlot,
-    displayName: componentDisplayName = null
+    name: componentName = null,
+    slot: componentSlot = null
   } = options;
 
   const func = function (styleArg) {
@@ -95,7 +94,7 @@ const styledFunction = function (tag) {
     }
 
     let Component = /*#__PURE__*/styled_component__default["default"](tag);
-    const displayName = componentName !== null && componentSlot !== null ? "".concat(componentName, "-").concat(componentSlot) : componentDisplayName;
+    const displayName = componentName !== null && componentSlot !== null ? "".concat(componentName, "-").concat(componentSlot) : null;
 
     if (displayName !== null) {
       Component = Component.attrs({

package/cjs/th.js

@@ -6,18 +6,29 @@ require('core-js/modules/esnext.async-iterator.for-each.js');
 require('core-js/modules/esnext.iterator.constructor.js');
 require('core-js/modules/esnext.iterator.for-each.js');
 
-const th = property => (value, dfault) => _ref => {
-  var _result;
-
-  let {
-    theme
-  } = _ref;
-  const parts = value.split('-');
-  let result = theme[property];
-  parts.forEach(part => {
-    if (result) result = result[part];
-  });
-  return (_result = result) !== null && _result !== void 0 ? _result : dfault;
+const th = property => {
+  const thGetter = function (value) {
+    let dfault = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+
+    const func = _ref => {
+      var _ref2;
+
+      let {
+        theme
+      } = _ref;
+      const parts = value.split('-');
+      let result = theme[property];
+      parts.forEach(part => {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        if (result) result = result[part];
+      });
+      return (_ref2 = result) !== null && _ref2 !== void 0 ? _ref2 : dfault;
+    };
+
+    return func;
+  };
+
+  return thGetter;
 };
 th.space = th('space');
 th.fontSize = th('fontSizes');

package/esm/styled/index.js

@@ -23,9 +23,8 @@ const styledFunction = function (tag) {
     slot: null
   };
   const {
-    name: componentName,
-    slot: componentSlot,
-    displayName: componentDisplayName = null
+    name: componentName = null,
+    slot: componentSlot = null
   } = options;
 
   const func = function (styleArg) {
@@ -86,7 +85,7 @@ const styledFunction = function (tag) {
     }
 
     let Component = /*#__PURE__*/styled_component(tag);
-    const displayName = componentName !== null && componentSlot !== null ? "".concat(componentName, "-").concat(componentSlot) : componentDisplayName;
+    const displayName = componentName !== null && componentSlot !== null ? "".concat(componentName, "-").concat(componentSlot) : null;
 
     if (displayName !== null) {
       Component = Component.attrs({

package/esm/th.js

@@ -2,18 +2,29 @@ import 'core-js/modules/esnext.async-iterator.for-each.js';
 import 'core-js/modules/esnext.iterator.constructor.js';
 import 'core-js/modules/esnext.iterator.for-each.js';
 
-const th = property => (value, dfault) => _ref => {
-  var _result;
+const th = property => {
+  const thGetter = function (value) {
+    let dfault = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
 
-  let {
-    theme
-  } = _ref;
-  const parts = value.split('-');
-  let result = theme[property];
-  parts.forEach(part => {
-    if (result) result = result[part];
-  });
-  return (_result = result) !== null && _result !== void 0 ? _result : dfault;
+    const func = _ref => {
+      var _ref2;
+
+      let {
+        theme
+      } = _ref;
+      const parts = value.split('-');
+      let result = theme[property];
+      parts.forEach(part => {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        if (result) result = result[part];
+      });
+      return (_ref2 = result) !== null && _ref2 !== void 0 ? _ref2 : dfault;
+    };
+
+    return func;
+  };
+
+  return thGetter;
 };
 th.space = th('space');
 th.fontSize = th('fontSizes');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elliemae/ds-system",
-  "version": "2.2.0-next.4",
+  "version": "2.2.0-next.8",
   "license": "MIT",
   "description": "ICE MT - Dimsum - System",
   "module": "./esm/index.js",
@@ -89,7 +89,7 @@
     "generateSubmodules": true
   },
   "dependencies": {
-    "@elliemae/ds-utilities": "2.2.0-next.4",
+    "@elliemae/ds-utilities": "2.2.0-next.8",
     "polished": "~3.6.7"
   },
   "devDependencies": {

package/types/styled/types.d.ts

@@ -23,6 +23,5 @@ export declare type StyledFunction = <C extends AnyStyledComponent | keyof JSX.I
     name: string | null;
     slot: string | null;
 }) => ThemedStyledFunctionBase<C extends AnyStyledComponent ? StyledComponentInnerComponent<C> : C, Theme, C extends AnyStyledComponent ? StyledComponentInnerOtherProps<C> : {}, C extends AnyStyledComponent ? StyledComponentInnerAttrs<C> : never>;
-export interface StyledObject extends ThemedStyledComponentFactories<Theme> {
-}
+export declare type StyledObject = ThemedStyledComponentFactories<Theme>;
 export declare type Styled = StyledFunction & StyledObject;

package/types/th.d.ts

@@ -1,14 +1,17 @@
-declare type thGetter = (value: string, dfault: string) => (theme: any) => string;
-declare type thConstructor = ((property: string) => thGetter) & {
-    space: thGetter;
-    fontSize: thGetter;
-    fontWeight: thGetter;
-    lineHeight: thGetter;
-    letterSpacing: thGetter;
-    font: thGetter;
-    color: thGetter;
-    breakpoint: thGetter;
-    media: thGetter;
+import type { Theme } from '@elliemae/pui-theme';
+declare type ThGetter = (value: string, dfault?: string) => ({ theme }: {
+    theme: Theme;
+}) => string;
+declare type ThConstructor = ((property: keyof Theme) => ThGetter) & {
+    space: ThGetter;
+    fontSize: ThGetter;
+    fontWeight: ThGetter;
+    lineHeight: ThGetter;
+    letterSpacing: ThGetter;
+    font: ThGetter;
+    color: ThGetter;
+    breakpoint: ThGetter;
+    media: ThGetter;
 };
-export declare const th: thConstructor;
+export declare const th: ThConstructor;
 export {};