From 0045b0e4035ca6343003a8f927d1ba70f1f75ca6 Mon Sep 17 00:00:00 2001 From: Vjacheslav Trushkin Date: Thu, 6 May 2021 16:49:46 +0300 Subject: [PATCH] Minor fixes --- packages/core/tsconfig-base.json | 2 +- packages/react-demo/src/App.js | 4 +-- .../react-demo/src/demo-components/Inline.jsx | 2 +- .../src/demo-components/UsageFull.jsx | 2 +- .../src/demo-components/UsageFullOffline.jsx | 2 +- .../src/test-components/TestsFull.jsx | 2 +- .../src/test-components/TestsFullOffline.jsx | 2 +- packages/react/src/render.ts | 2 +- packages/svelte-demo/src/App.svelte | 2 +- packages/svelte/src/functions.ts | 16 ------------ packages/svelte/src/render.ts | 2 +- packages/vue/src/offline.ts | 25 ------------------- 12 files changed, 11 insertions(+), 52 deletions(-) diff --git a/packages/core/tsconfig-base.json b/packages/core/tsconfig-base.json index 939dd12..3b5086e 100644 --- a/packages/core/tsconfig-base.json +++ b/packages/core/tsconfig-base.json @@ -4,7 +4,7 @@ "module": "commonjs", "declaration": true, "declarationMap": true, - "sourceMap": true, + "sourceMap": false, "composite": true, "strict": true, "moduleResolution": "node", diff --git a/packages/react-demo/src/App.js b/packages/react-demo/src/App.js index 5fad717..14acb97 100644 --- a/packages/react-demo/src/App.js +++ b/packages/react-demo/src/App.js @@ -7,7 +7,7 @@ import { addIcon as addOnlineIcon, addCollection as addOnlineCollection, disableCache, -} from '@iconify/react/dist/iconify'; +} from '@iconify/react'; import presentationPlay from '@iconify-icons/mdi-light/presentation-play'; import playIcon from '@iconify-icons/mdi-light/play'; @@ -31,7 +31,7 @@ addOfflineIcon('demo', presentationPlay); // Add 'mdi-light:play' as 'demo' for full module addOnlineIcon('demo', playIcon); -// Add custom icon as 'experiment' +// Add different custom icons as 'experiment2' for offline and online modes addOfflineIcon('experiment2', { width: 16, height: 16, diff --git a/packages/react-demo/src/demo-components/Inline.jsx b/packages/react-demo/src/demo-components/Inline.jsx index d4d2638..d3de347 100644 --- a/packages/react-demo/src/demo-components/Inline.jsx +++ b/packages/react-demo/src/demo-components/Inline.jsx @@ -1,6 +1,6 @@ import React from 'react'; import { Icon as OfflineIcon } from '@iconify/react/dist/offline'; -import { Icon as FullIcon } from '@iconify/react/dist/iconify'; +import { Icon as FullIcon } from '@iconify/react'; export function InlineDemo() { return ( diff --git a/packages/react-demo/src/demo-components/UsageFull.jsx b/packages/react-demo/src/demo-components/UsageFull.jsx index cc9020e..01fa8d7 100644 --- a/packages/react-demo/src/demo-components/UsageFull.jsx +++ b/packages/react-demo/src/demo-components/UsageFull.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Icon } from '@iconify/react/dist/iconify'; +import { Icon } from '@iconify/react'; export function FullUsageDemo() { return ( diff --git a/packages/react-demo/src/demo-components/UsageFullOffline.jsx b/packages/react-demo/src/demo-components/UsageFullOffline.jsx index 238da75..5e6e5ae 100644 --- a/packages/react-demo/src/demo-components/UsageFullOffline.jsx +++ b/packages/react-demo/src/demo-components/UsageFullOffline.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Icon } from '@iconify/react/dist/iconify'; +import { Icon } from '@iconify/react'; import accountIcon from '@iconify-icons/mdi-light/account'; import alertIcon from '@iconify-icons/mdi-light/alert'; diff --git a/packages/react-demo/src/test-components/TestsFull.jsx b/packages/react-demo/src/test-components/TestsFull.jsx index ddffcc9..afc05e5 100644 --- a/packages/react-demo/src/test-components/TestsFull.jsx +++ b/packages/react-demo/src/test-components/TestsFull.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import { InlineIcon, addAPIProvider, _api } from '@iconify/react/dist/iconify'; +import { InlineIcon, addAPIProvider, _api } from '@iconify/react'; import { mockAPIModule, mockAPIData } from '@iconify/core/lib/api/modules/mock'; import { TestIcons, toggleTest } from './TestIcons'; import playIcon from '@iconify-icons/mdi-light/map-marker'; diff --git a/packages/react-demo/src/test-components/TestsFullOffline.jsx b/packages/react-demo/src/test-components/TestsFullOffline.jsx index 4019488..cff9ddc 100644 --- a/packages/react-demo/src/test-components/TestsFullOffline.jsx +++ b/packages/react-demo/src/test-components/TestsFullOffline.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import { InlineIcon } from '@iconify/react/dist/iconify'; +import { InlineIcon } from '@iconify/react'; import { TestIcons, toggleTest } from './TestIcons'; export function TestsFullOffline() { diff --git a/packages/react/src/render.ts b/packages/react/src/render.ts index 637c9e8..829af74 100644 --- a/packages/react/src/render.ts +++ b/packages/react/src/render.ts @@ -104,7 +104,7 @@ export const render = ( if (typeof value === 'string') { customisations[key] = rotateFromString(value); } else if (typeof value === 'number') { - componentProps[key] = value; + customisations[key] = value; } break; diff --git a/packages/svelte-demo/src/App.svelte b/packages/svelte-demo/src/App.svelte index 0490c7f..835f5db 100644 --- a/packages/svelte-demo/src/App.svelte +++ b/packages/svelte-demo/src/App.svelte @@ -4,7 +4,7 @@ addIcon as addOnlineIcon, addCollection as addOnlineCollection, disableCache, - } from '@iconify/svelte/dist/iconify'; + } from '@iconify/svelte'; import presentationPlay from '@iconify-icons/mdi-light/presentation-play'; import playIcon from '@iconify-icons/mdi-light/play'; diff --git a/packages/svelte/src/functions.ts b/packages/svelte/src/functions.ts index d60df74..3d9b24f 100644 --- a/packages/svelte/src/functions.ts +++ b/packages/svelte/src/functions.ts @@ -288,22 +288,6 @@ if (typeof document !== 'undefined' && typeof window !== 'undefined') { } } -/* - -. - -. - -. - -. - -. - -. - -*/ - /** * Function to get icon status */ diff --git a/packages/svelte/src/render.ts b/packages/svelte/src/render.ts index 3ae84f8..aa0ab91 100644 --- a/packages/svelte/src/render.ts +++ b/packages/svelte/src/render.ts @@ -83,7 +83,7 @@ export function render( if (typeof value === 'string') { customisations[key] = rotateFromString(value); } else if (typeof value === 'number') { - componentProps[key] = value; + customisations[key] = value; } break; diff --git a/packages/vue/src/offline.ts b/packages/vue/src/offline.ts index 79821ea..0d24b55 100644 --- a/packages/vue/src/offline.ts +++ b/packages/vue/src/offline.ts @@ -80,31 +80,6 @@ export function addCollection( /** * Component */ -/* -// Currently this cannot be used because in functional component style is inherited, overriding style generated by render() -export function Icon(props: Record, context): VNode { - // Check icon - const icon = - typeof props.icon === 'string' - ? storage[props.icon] - : typeof props.icon === 'object' - ? fullIcon(props.icon as IconifyIcon) - : null; - - // Validate icon object - if ( - icon === null || - typeof icon !== 'object' || - typeof icon.body !== 'string' - ) { - return context.slots.default ? context.slots.default() : null; - } - - // Valid icon: render it - return render(icon, context.attrs as IconProps); -} -*/ - export const Icon = defineComponent({ // Do not inherit other attributes: it is handled by render() inheritAttrs: false,