feat(icons-ui): update spectrum css input

adobe · Jan 6, 2021 · 4cb87ff · 4cb87ff
1 parent 549b4b6
commit 4cb87ff
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 32 deletions.
diff --git a/packages/icons-ui/bin/build.js b/packages/icons-ui/bin/build.js
@@ -58,7 +58,6 @@ glob(`${rootDir}/node_modules/${iconsPath}/**.svg`, (err, icons) => {
         const $ = cheerio.load(svg, {
             xmlMode: true,
         });
-        const title = Case.capital(id);
         const fileName = `${id}.ts`;
         const location = path.join(
             rootDir,
@@ -72,21 +71,15 @@ glob(`${rootDir}/node_modules/${iconsPath}/**.svg`, (err, icons) => {
 
         $('*').each((index, el) => {
             if (el.name === 'svg') {
-                $(el).attr('aria-hidden', '...');
-                $(el).attr('role', 'img');
+                $(el).attr('aria-hidden', 'true');
                 if (keepColors !== 'keep') {
                     $(el).attr('fill', 'currentColor');
                 }
-                $(el).attr('aria-label', '${title}');
                 $(el).removeAttr('id');
             }
             if (el.name === 'defs') {
                 $(el).remove();
             }
-            const dimensions = {
-                width: 0,
-                height: 0,
-            };
             Object.keys(el.attribs).forEach((x) => {
                 if (x === 'class') {
                     $(el).removeAttr(x);
@@ -97,17 +90,7 @@ glob(`${rootDir}/node_modules/${iconsPath}/**.svg`, (err, icons) => {
                 if (keepColors !== 'keep' && x === 'fill') {
                     $(el).attr(x, 'currentColor');
                 }
-                if (el.name === 'svg') {
-                    if (x === 'width' || x === 'height') {
-                        dimensions[x] = $(el).attr(x);
-                        $(el).attr(x, '${' + x + '}');
-                    }
-                }
             });
-            $(el).attr(
-                'viewBox',
-                `0 0 ${dimensions.width} ${dimensions.height}`
-            );
         });
 
         const iconLiteral = `
@@ -116,18 +99,8 @@ glob(`${rootDir}/node_modules/${iconsPath}/**.svg`, (err, icons) => {
       import {tag as html, TemplateResult} from '../custom-tag.js';
 
       export {setCustomTemplateLiteralTag} from '../custom-tag.js';
-      export const ${ComponentName}Icon = ({
-        width = 24,
-        height = 24,
-        hidden = false,
-        title = '${title}',
-      } = {},): string | TemplateResult => {
-        return html\`${$('svg')
-            .toString()
-            .replace(
-                'aria-hidden="..."',
-                "aria-hidden=\"${hidden ? 'true' : 'false'}\""
-            )}\`;
+      export const ${ComponentName}Icon = (): string | TemplateResult => {
+        return html\`${$('svg').toString()}\`;
       }
     `;
 

diff --git a/packages/icons-ui/package.json b/packages/icons-ui/package.json
@@ -44,7 +44,7 @@
     "author": "",
     "license": "Apache-2.0",
     "devDependencies": {
-        "@spectrum-css/icon": "^3.0.0-beta.1",
+        "@spectrum-css/icon": "^3.0.0-beta.2",
         "@spectrum-web-components/icon": "^0.6.3",
         "@spectrum-web-components/iconset": "^0.1.7",
         "case": "^1.6.1",

diff --git a/packages/icons-ui/stories/icons-ui.stories.ts b/packages/icons-ui/stories/icons-ui.stories.ts
@@ -38,7 +38,7 @@ export const ui = (): TemplateResult => {
     }
     const size = select(
         'Icon Size',
-        ['xxs', 'xs', 's', 'm', 'l', 'xl', 'xxl'],
+        ['s', 'm', 'l', 'xl', 'xxl'],
         'm',
         'Element'
     );