refactor: Remove IconSettings context

VKCOM · Aug 16, 2023 · ec27fd5 · ec27fd5
1 parent eaff6da
commit ec27fd5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 46 deletions.
diff --git a/packages/icons-scripts/scripts/icons.js b/packages/icons-scripts/scripts/icons.js
@@ -150,7 +150,7 @@ function generateIcons(options) {
  * @param {string} dir
  */
 function createIndexExports(exportsMap, dir) {
-  const exported = [`export { IconSettingsProvider } from '@vkontakte/icons-sprite';`];
+  const exported = [];
 
   const keys = Object.keys(exportsMap);
   if (!keys) {

diff --git a/packages/icons-sprite/src/IconSettings.tsx b/packages/icons-sprite/src/IconSettings.tsx
diff --git a/packages/icons-sprite/src/SvgIcon.tsx b/packages/icons-sprite/src/SvgIcon.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import { BrowserSymbol } from './browser-symbol';
-import { IconSettingsInterface, IconSettingsContext } from './IconSettings';
 import { addSpriteSymbol, useIsomorphicLayoutEffect } from './sprite';
 import { warnOnce } from './warnOnce';
 
@@ -11,19 +10,6 @@ export interface SvgIconProps extends React.SVGProps<SVGSVGElement> {
   title?: string;
 }
 
-function iconClass(fragments: string[], { classPrefix, globalClasses }: IconSettingsInterface) {
-  let res = '';
-  for (let i = 0; i < fragments.length; i++) {
-    if (classPrefix) {
-      res += ' ' + (classPrefix + fragments[i]);
-    }
-    if (!classPrefix || globalClasses) {
-      res += ' ' + fragments[i];
-    }
-  }
-  return res;
-}
-
 const SvgIcon = ({
   width = 0,
   height = 0,
@@ -39,12 +25,6 @@ const SvgIcon = ({
 }: SvgIconProps) => {
   const size = Math.max(width, height);
 
-  const iconSettings = React.useContext(IconSettingsContext);
-  const ownClass = iconClass(
-    ['Icon', `Icon--${size}`, `Icon--w-${width}`, `Icon--h-${height}`, `Icon--${id}`],
-    iconSettings,
-  );
-
   const style = {
     width,
     height,
@@ -56,7 +36,16 @@ const SvgIcon = ({
       aria-hidden="true"
       display="block"
       {...restProps}
-      className={`${ownClass} ${className}`}
+      className={[
+        'vkuiIcon',
+        `vkuiIcon--${size}`,
+        `vkuiIcon--w-${width}`,
+        `vkuiIcon--h-${height}`,
+        `vkuiIcon--${id}`,
+        className,
+      ]
+        .join(' ')
+        .trim()}
       viewBox={viewBox}
       width={width}
       height={height}

diff --git a/packages/icons-sprite/src/index.ts b/packages/icons-sprite/src/index.ts
@@ -1,4 +1,3 @@
 export { BrowserSprite } from './browser-sprite';
 export { BrowserSymbol } from './browser-symbol';
 export { makeIcon } from './SvgIcon';
-export { IconSettingsProvider } from './IconSettings';