@symbo.ls/icon 2.33.38 → 2.33.40

package/index.js

@@ -1,22 +1,5 @@
 'use strict'
 
-const inheritFromIsActive = (el) => {
-  const { props } = el
-  const propsActive = props['.isActive']
-  return el.call('exec', propsActive.name || propsActive.icon)
-}
-
-const getIconName = (el, s) => {
-  const { key, props } = el
-  let icon = el.call('exec', props.name || props.icon || key, el)
-
-  if (el.call('isString', icon) && icon.includes('{{')) {
-    icon = el.call('replaceLiteralsWithObjectFields', icon)
-  }
-
-  return el.call('isString', icon) ? icon : key
-}
-
 export const Icon = {
   extend: 'Svg',
   props: (el, s, ctx) => {
@@ -24,6 +7,63 @@ export const Icon = {
     const { ICONS, useIconSprite, verbose } = ctx && ctx.designSystem
     const { toCamelCase } = ctx && ctx.utils
 
+    const inheritFromIsActive = (el) => {
+      const { props } = el
+      const propsActive = props['.isActive']
+      return el.call('exec', propsActive.name || propsActive.icon)
+    }
+
+    const getSemanticIcon = (el, s, ctx) => {
+      const { SEMANTIC_ICONS } = ctx && ctx.designSystem
+      const { toCamelCase } = ctx && ctx.utils
+
+      let iconName = getIconName(el, s)
+      const camelCase = toCamelCase(iconName)
+      const isArray = camelCase.split(/([a-z])([A-Z])/g)
+      const semanticIconRootName = isArray[1]
+        ? isArray[0]
+        : iconName.split('.')[0].split(' ')[0]
+      const semanticIcon =
+        SEMANTIC_ICONS && SEMANTIC_ICONS[semanticIconRootName]
+      if (semanticIcon) {
+        const iconKey = iconName.includes('.')
+          ? 'sfsymbols.' + iconName.split('.').slice(1).join('.')
+          : 'sfsymbols'
+        iconName =
+          semanticIcon[iconKey] ||
+          semanticIcon[iconName.split('.')[0].split(' ')[0]]
+        return {
+          tag: 'span',
+          semantic_symbols: true,
+          width: 'A',
+          height: 'A',
+          lineHeight: '1em',
+          ':after': {
+            fontSize: 'Z',
+            fontWeight: '300',
+            content: `"${iconName}"`,
+            textAlign: 'center',
+            display: 'inline-block',
+            style: {
+              color: 'currentColor',
+              fontFamily: "'SF Pro Icons', 'SF Pro', 'SF Symbols', 'Segoe UI'"
+            }
+          }
+        }
+      }
+    }
+
+    const getIconName = (el, s) => {
+      const { key, props } = el
+      let icon = el.call('exec', props.name || props.icon || key, el)
+
+      if (el.call('isString', icon) && icon.includes('{{')) {
+        icon = el.call('replaceLiteralsWithObjectFields', icon)
+      }
+
+      return el.call('isString', icon) ? icon : key
+    }
+
     const iconName = getIconName(el, s)
     const camelCase = toCamelCase(iconName)
     const isArray = camelCase.split(/([a-z])([A-Z])/g)
@@ -41,22 +81,30 @@ export const Icon = {
       parentPropsActive &&
       parentPropsActive.icon
     ) {
-      activeIconName = el.call('exec',
-        parentPropsActive.icon || parentPropsActive.Icon.name || parentPropsActive.Icon.icon, el
+      activeIconName = el.call(
+        'exec',
+        parentPropsActive.icon ||
+          parentPropsActive.Icon.name ||
+          parentPropsActive.Icon.icon,
+        el
       )
     }
 
     if (el.call('isString', activeIconName) && activeIconName.includes('{{')) {
-      activeIconName = el.call('replaceLiteralsWithObjectFields', activeIconName)
+      activeIconName = el.call(
+        'replaceLiteralsWithObjectFields',
+        activeIconName
+      )
     }
 
     let iconInContext
     if (ICONS[activeIconName]) iconInContext = activeIconName
     if (ICONS[camelCase]) iconInContext = camelCase
-    else if (ICONS[isArray[0] + isArray[1]]) iconInContext = isArray[0] + isArray[1]
+    else if (ICONS[isArray[0] + isArray[1]])
+      iconInContext = isArray[0] + isArray[1]
     else if (ICONS[isArray[0]]) iconInContext = isArray[0]
     else {
-      if (verbose) el.warn('Can\'t find icon:', iconName, iconInContext)
+      if (verbose) el.warn("Can't find icon:", iconName, iconInContext)
     }
 
     const iconFromLibrary = ICONS[iconInContext]
@@ -93,13 +141,16 @@ export const IconText = {
   Icon: {
     if: (el) => {
       const { parent, props } = el
-      return el.call('exec', parent.props.icon ||
-        props.name ||
-        props.sfSymbols ||
-        parent.props.sfSymbols
-      , el)
+      return el.call(
+        'exec',
+        parent.props.icon ||
+          props.name ||
+          props.sfSymbols ||
+          parent.props.sfSymbols,
+        el
+      )
     },
-    icon: el => el.call('exec', el.parent.props.icon, el.parent)
+    icon: (el) => el.call('exec', el.parent.props.icon, el.parent)
   },
 
   text: ({ props }) => props.text
@@ -119,36 +170,3 @@ export const FileIcon = {
     icon: 'file'
   }
 }
-
-const getSemanticIcon = (el, s, ctx) => {
-  const { SEMANTIC_ICONS } = ctx && ctx.designSystem
-  const { toCamelCase } = ctx && ctx.utils
-
-  let iconName = getIconName(el, s)
-  const camelCase = toCamelCase(iconName)
-  const isArray = camelCase.split(/([a-z])([A-Z])/g)
-  const semanticIconRootName = isArray[1] ? isArray[0] : iconName.split('.')[0].split(' ')[0]
-  const semanticIcon = SEMANTIC_ICONS && SEMANTIC_ICONS[semanticIconRootName]
-  if (semanticIcon) {
-    const iconKey = iconName.includes('.') ? 'sfsymbols.' + iconName.split('.').slice(1).join('.') : 'sfsymbols'
-    iconName = semanticIcon[iconKey] || semanticIcon[iconName.split('.')[0].split(' ')[0]]
-    return {
-      tag: 'span',
-      semantic_symbols: true,
-      width: 'A',
-      height: 'A',
-      lineHeight: '1em',
-      ':after': {
-        fontSize: 'Z',
-        fontWeight: '300',
-        content: `"${iconName}"`,
-        textAlign: 'center',
-        display: 'inline-block',
-        style: {
-          color: 'currentColor',
-          fontFamily: "'SF Pro Icons', 'SF Pro', 'SF Symbols', 'Segoe UI'"
-        }
-      }
-    }
-  }
-}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@symbo.ls/icon",
-  "version": "2.33.38",
+  "version": "2.33.40",
   "main": "index.js",
   "license": "MIT",
-  "gitHead": "7048f2fd761c7aa6a4233019c1b91318d88e64ce",
+  "gitHead": "116c2647820d1a8cb0147eee069817c7d5b59f09",
   "dependencies": {
-    "@symbo.ls/atoms": "^2.33.38",
-    "@symbo.ls/utils": "^2.33.38"
+    "@symbo.ls/atoms": "^2.33.40",
+    "@symbo.ls/utils": "^2.33.40"
   },
   "source": "src/index.js"
 }