@elliemae/ds-classnames 2.0.1 → 2.1.0-rc.2

package/cjs/aggregatedClasses.js

@@ -13,8 +13,8 @@ require('core-js/modules/esnext.async-iterator.filter.js');
 require('core-js/modules/esnext.iterator.filter.js');
 var React = require('react');
 var cx = require('obj-str');
-var classNameManager = require('./classNameManager.js');
 var DimsumConfig = require('@elliemae/ds-shared/dimsum.config');
+var classNameManager = require('./classNameManager.js');
 var validateNativeProps = require('./validateNativeProps.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -27,9 +27,9 @@ var DimsumConfig__default = /*#__PURE__*/_interopDefaultLegacy(DimsumConfig);
 
 const _excluded = ["innerRef", "children", "classProps", "useComponent", "className", "as"];
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 const cssPrefix = DimsumConfig__default["default"].classNamePrefix;
 
 const generateClassNameWithModifier = (block, element, modifier) => "".concat(cssPrefix, "-").concat(block).concat(element ? "__".concat(element) : '', "--").concat(modifier);
@@ -38,57 +38,54 @@ const appendBlockAndPrefixToObj = (obj, block, element) => obj ? Object.keys(obj
   ["".concat(generateClassNameWithModifier(block, element, key))]: obj[key]
 }), {}) : [];
 
-function aggregatedClasses(type, props) {
-  // aggregatedClasses options parameters
-  return function (block, element, additionalModifiers) {
-    let options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-    return /*#__PURE__*/React__default["default"].forwardRef((_ref, ref) => {
-      let {
-        innerRef,
-        children,
-        classProps,
-        useComponent,
-        className,
-        as
-      } = _ref,
-          rest = _objectWithoutProperties__default["default"](_ref, _excluded);
-
-      // get the additional classNames either from a function or an object
-      let otherModifiers = appendBlockAndPrefixToObj(additionalModifiers, block, element);
-      if (typeof additionalModifiers === 'function') otherModifiers = appendBlockAndPrefixToObj(additionalModifiers(_objectSpread(_objectSpread(_objectSpread({}, rest), classProps), {}, {
-        className
-      })), block, element);
-      const otherModifiersStr = cx__default["default"](otherModifiers);
-      const {
-        prefix,
-        propsToRemoveFromFinalElement = []
-      } = options;
-      const {
-        cssClassName: classNames
-      } = classNameManager["default"](block, null, _objectSpread({}, classProps), {
-        prefix,
-        element
-      });
-
-      const cleanedPropsPassedDown = _objectSpread(_objectSpread({}, props), rest);
-
-      propsToRemoveFromFinalElement.forEach(propKey => {
-        delete cleanedPropsPassedDown[propKey];
-      });
+const aggregatedClasses = (type, props) => function (block, element, additionalModifiers) {
+  let options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  return /*#__PURE__*/React__default["default"].forwardRef((_ref, ref) => {
+    let {
+      innerRef,
+      children,
+      classProps,
+      useComponent,
+      className,
+      as
+    } = _ref,
+        rest = _objectWithoutProperties__default["default"](_ref, _excluded);
+
+    // get the additional classNames either from a function or an object
+    let otherModifiers = appendBlockAndPrefixToObj(additionalModifiers, block, element);
+    if (typeof additionalModifiers === 'function') otherModifiers = appendBlockAndPrefixToObj(additionalModifiers(_objectSpread(_objectSpread(_objectSpread({}, rest), classProps), {}, {
+      className
+    })), block, element);
+    const otherModifiersStr = cx__default["default"](otherModifiers);
+    const {
+      prefix,
+      propsToRemoveFromFinalElement = []
+    } = options;
+    const {
+      cssClassName: classNames
+    } = classNameManager["default"](block, null, _objectSpread({}, classProps), {
+      prefix,
+      element
+    });
 
-      if (validateNativeProps.isNativeHTMLElement(block)) {
-        Object.keys(cleanedPropsPassedDown).forEach(key => {
-          if (!validateNativeProps.isValidNativeAttribute(key)) delete cleanedPropsPassedDown[key];
-        });
-      }
+    const cleanedPropsPassedDown = _objectSpread(_objectSpread({}, props), rest);
 
-      return /*#__PURE__*/React__default["default"].createElement(as || type, _objectSpread({
-        ref: innerRef || ref,
-        className: [classNames, otherModifiersStr, className].join(' ')
-      }, cleanedPropsPassedDown), children);
+    propsToRemoveFromFinalElement.forEach(propKey => {
+      delete cleanedPropsPassedDown[propKey];
     });
-  };
-}
+
+    if (validateNativeProps.isNativeHTMLElement(block)) {
+      Object.keys(cleanedPropsPassedDown).forEach(key => {
+        if (!validateNativeProps.isValidNativeAttribute(key)) delete cleanedPropsPassedDown[key];
+      });
+    }
+
+    return /*#__PURE__*/React__default["default"].createElement(as || type, _objectSpread({
+      ref: innerRef || ref,
+      className: [classNames, otherModifiersStr, className].join(' ')
+    }, cleanedPropsPassedDown), children);
+  });
+};
 
 exports.cssPrefix = cssPrefix;
 exports["default"] = aggregatedClasses;

package/cjs/validateNativeProps.js

@@ -13,9 +13,9 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 /* eslint-disable max-lines */
 const attributeWhiteList = {

package/esm/aggregatedClasses.js

@@ -9,15 +9,15 @@ import 'core-js/modules/esnext.async-iterator.for-each.js';
 import 'core-js/modules/esnext.iterator.for-each.js';
 import React from 'react';
 import cx from 'obj-str';
-import cssPipeline from './classNameManager.js';
 import DimsumConfig from '@elliemae/ds-shared/dimsum.config';
+import cssPipeline from './classNameManager.js';
 import { isNativeHTMLElement, isValidNativeAttribute } from './validateNativeProps.js';
 
 const _excluded = ["innerRef", "children", "classProps", "useComponent", "className", "as"];
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 const cssPrefix = DimsumConfig.classNamePrefix;
 
 const generateClassNameWithModifier = (block, element, modifier) => "".concat(cssPrefix, "-").concat(block).concat(element ? "__".concat(element) : '', "--").concat(modifier);
@@ -26,56 +26,53 @@ const appendBlockAndPrefixToObj = (obj, block, element) => obj ? Object.keys(obj
   ["".concat(generateClassNameWithModifier(block, element, key))]: obj[key]
 }), {}) : [];
 
-function aggregatedClasses(type, props) {
-  // aggregatedClasses options parameters
-  return function (block, element, additionalModifiers) {
-    let options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-    return /*#__PURE__*/React.forwardRef((_ref, ref) => {
-      let {
-        innerRef,
-        children,
-        classProps,
-        useComponent,
-        className,
-        as
-      } = _ref,
-          rest = _objectWithoutProperties(_ref, _excluded);
+const aggregatedClasses = (type, props) => function (block, element, additionalModifiers) {
+  let options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  return /*#__PURE__*/React.forwardRef((_ref, ref) => {
+    let {
+      innerRef,
+      children,
+      classProps,
+      useComponent,
+      className,
+      as
+    } = _ref,
+        rest = _objectWithoutProperties(_ref, _excluded);
 
-      // get the additional classNames either from a function or an object
-      let otherModifiers = appendBlockAndPrefixToObj(additionalModifiers, block, element);
-      if (typeof additionalModifiers === 'function') otherModifiers = appendBlockAndPrefixToObj(additionalModifiers(_objectSpread(_objectSpread(_objectSpread({}, rest), classProps), {}, {
-        className
-      })), block, element);
-      const otherModifiersStr = cx(otherModifiers);
-      const {
-        prefix,
-        propsToRemoveFromFinalElement = []
-      } = options;
-      const {
-        cssClassName: classNames
-      } = cssPipeline(block, null, _objectSpread({}, classProps), {
-        prefix,
-        element
-      });
+    // get the additional classNames either from a function or an object
+    let otherModifiers = appendBlockAndPrefixToObj(additionalModifiers, block, element);
+    if (typeof additionalModifiers === 'function') otherModifiers = appendBlockAndPrefixToObj(additionalModifiers(_objectSpread(_objectSpread(_objectSpread({}, rest), classProps), {}, {
+      className
+    })), block, element);
+    const otherModifiersStr = cx(otherModifiers);
+    const {
+      prefix,
+      propsToRemoveFromFinalElement = []
+    } = options;
+    const {
+      cssClassName: classNames
+    } = cssPipeline(block, null, _objectSpread({}, classProps), {
+      prefix,
+      element
+    });
 
-      const cleanedPropsPassedDown = _objectSpread(_objectSpread({}, props), rest);
+    const cleanedPropsPassedDown = _objectSpread(_objectSpread({}, props), rest);
 
-      propsToRemoveFromFinalElement.forEach(propKey => {
-        delete cleanedPropsPassedDown[propKey];
-      });
+    propsToRemoveFromFinalElement.forEach(propKey => {
+      delete cleanedPropsPassedDown[propKey];
+    });
 
-      if (isNativeHTMLElement(block)) {
-        Object.keys(cleanedPropsPassedDown).forEach(key => {
-          if (!isValidNativeAttribute(key)) delete cleanedPropsPassedDown[key];
-        });
-      }
+    if (isNativeHTMLElement(block)) {
+      Object.keys(cleanedPropsPassedDown).forEach(key => {
+        if (!isValidNativeAttribute(key)) delete cleanedPropsPassedDown[key];
+      });
+    }
 
-      return /*#__PURE__*/React.createElement(as || type, _objectSpread({
-        ref: innerRef || ref,
-        className: [classNames, otherModifiersStr, className].join(' ')
-      }, cleanedPropsPassedDown), children);
-    });
-  };
-}
+    return /*#__PURE__*/React.createElement(as || type, _objectSpread({
+      ref: innerRef || ref,
+      className: [classNames, otherModifiersStr, className].join(' ')
+    }, cleanedPropsPassedDown), children);
+  });
+};
 
 export { cssPrefix, aggregatedClasses as default };

package/esm/validateNativeProps.js

@@ -5,9 +5,9 @@ import 'core-js/modules/esnext.async-iterator.for-each.js';
 import 'core-js/modules/esnext.iterator.for-each.js';
 import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 /* eslint-disable max-lines */
 const attributeWhiteList = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elliemae/ds-classnames",
-  "version": "2.0.1",
+  "version": "2.1.0-rc.2",
   "license": "MIT",
   "description": "ICE MT - Dimsum Library - Aggregated classNames to component",
   "module": "./esm/index.js",
@@ -68,8 +68,8 @@
     "dev": "cross-env NODE_ENV=development && node ../../scripts/build/build.js -w"
   },
   "dependencies": {
-    "@elliemae/ds-shared": "2.0.1",
-    "@elliemae/ds-utilities": "2.0.1",
+    "@elliemae/ds-shared": "2.1.0-rc.2",
+    "@elliemae/ds-utilities": "2.1.0-rc.2",
     "obj-str": "~1.0.3"
   },
   "publishConfig": {

package/types/aggregatedClasses.d.ts

@@ -1,4 +1,11 @@
 import React from 'react';
 export declare const cssPrefix: any;
-declare function aggregatedClasses(type: any, props: any): (block: any, element: any, additionalModifiers: any, options?: {}) => React.ForwardRefExoticComponent<React.RefAttributes<unknown>>;
+declare type AggregatedClassesT<T = unknown> = (type: any, props?: any) => (block: string, element?: string | null, additionalModifiers?: {
+    [key: string]: unknown;
+} | ((arg: any) => {
+    [key: string]: unknown;
+}), options?: {
+    [key: string]: unknown;
+}) => React.ForwardRefExoticComponent<React.RefAttributes<T>>;
+declare const aggregatedClasses: AggregatedClassesT;
 export default aggregatedClasses;

package/types/classNameManager.d.ts

@@ -10,7 +10,11 @@ export declare const cssPrefix: string;
  * @param props
  * @param options
  */
-declare const cssPipeline: (blockName?: string, cssClassNameModifier?: string, props?: {}, options?: {}) => {
+declare const cssPipeline: (blockName?: string, cssClassNameModifier?: string, props?: {
+    [key: string]: any;
+}, options?: {
+    [key: string]: any;
+}) => {
     blockName: string;
     cssPrefix: string;
     prefixBlockName: string;