From f0ea34a57ea73a186105f1bbf8e4f7572e5c7e68 Mon Sep 17 00:00:00 2001 From: coliff Date: Tue, 12 Dec 2023 22:15:58 +0900 Subject: [PATCH 1/3] Fix Icon Inconsistent colors and class names Partial fix for #1889 --- .../icons/icon-accessibility-circle.tsx | 2 +- .../src/components/icons/icon-add.tsx | 4 ++-- .../src/components/icons/icon-apps.tsx | 7 ++----- .../src/components/icons/icon-arrow-down.tsx | 7 +++---- .../src/components/icons/icon-arrow-up.tsx | 8 ++++---- .../src/components/icons/icon-calendar.tsx | 7 ++----- .../src/components/icons/icon-cancel.tsx | 18 +++++++----------- .../src/components/icons/icon-caret-down.tsx | 6 +++--- .../src/components/icons/icon-caret-up.tsx | 6 +++--- .../icons/icon-check-circle-outline.tsx | 7 ++----- .../src/components/icons/icon-check-circle.tsx | 7 ++----- .../src/components/icons/icon-check.tsx | 3 +-- .../icons/icon-chevron-double-down.tsx | 2 +- .../icons/icon-chevron-double-up.tsx | 8 ++++---- .../icons/icon-chevron-left-thick.tsx | 7 ++----- .../icons/icon-chevron-right-thick.tsx | 7 +------ .../src/components/icons/icon-close.tsx | 2 +- .../src/components/icons/icon-collapse-all.tsx | 8 ++------ .../src/components/icons/icon-copy.tsx | 8 ++------ .../src/components/icons/icon-drag-handle.tsx | 12 +++++------- .../src/components/icons/icon-drag.tsx | 7 ++----- .../src/components/icons/icon-edit.tsx | 7 ++----- .../src/components/icons/icon-error.tsx | 4 ++-- .../src/components/icons/icon-expand-all.tsx | 8 ++------ .../src/components/icons/icon-export.tsx | 8 ++++---- .../components/icons/icon-file-bar-graph.tsx | 2 +- .../src/components/icons/icon-folder.tsx | 2 +- .../src/components/icons/icon-help.tsx | 7 ++----- .../src/components/icons/icon-history.tsx | 8 ++++---- .../icons/icon-horizontal-ellipsis.tsx | 9 +++++---- .../components/icons/icon-indeterminate.tsx | 6 +++--- .../src/components/icons/icon-info-outline.tsx | 2 +- .../src/components/icons/icon-info.tsx | 2 +- .../src/components/icons/icon-menu.tsx | 4 ++-- .../src/components/icons/icon-moon.tsx | 9 +++------ .../components/icons/icon-notifications.tsx | 7 ++----- .../src/components/icons/icon-pencil.tsx | 9 +++------ .../src/components/icons/icon-pin.tsx | 7 ++----- .../src/components/icons/icon-refresh.tsx | 8 ++------ .../src/components/icons/icon-remove.tsx | 2 +- .../src/components/icons/icon-search.tsx | 7 ++----- .../src/components/icons/icon-shield.tsx | 7 ++----- .../src/components/icons/icon-sort-a-z.tsx | 10 +++++----- .../src/components/icons/icon-sort-z-a.tsx | 2 +- .../src/components/icons/icon-sun.tsx | 7 ++----- .../components/icons/icon-timer-countdown.tsx | 9 +++------ .../components/icons/icon-triangle-down.tsx | 4 ++-- .../components/icons/icon-triangle-left.tsx | 4 ++-- .../src/components/icons/icon-tune.tsx | 6 +++--- .../src/components/icons/icon-upload-cloud.tsx | 10 +++++----- .../icons/icon-vertical-ellipsis.tsx | 5 +++-- .../components/icons/icon-visibility-off.tsx | 2 +- .../src/components/icons/icon-visibility.tsx | 2 +- .../components/icons/icon-warning-outline.tsx | 4 ++-- .../src/components/icons/icon-warning.tsx | 3 +-- .../src/components/icons/icon.spec.tsx | 16 ++++++++-------- .../modus-button/modus-button.spec.ts | 2 +- .../modus-checkbox/modus-checkbox.spec.tsx | 2 +- .../modus-content-tree.spec.tsx | 2 +- .../modus-file-dropzone.spec.ts | 2 +- .../modus-message/modus-message.spec.ts | 2 +- .../components/modus-modal/modus-modal.spec.ts | 2 +- .../modus-sentiment-scale.tsx | 1 + .../components/modus-toast/modus-toast.spec.ts | 2 +- 64 files changed, 146 insertions(+), 221 deletions(-) diff --git a/stencil-workspace/src/components/icons/icon-accessibility-circle.tsx b/stencil-workspace/src/components/icons/icon-accessibility-circle.tsx index 800627ef8..4b139b24e 100644 --- a/stencil-workspace/src/components/icons/icon-accessibility-circle.tsx +++ b/stencil-workspace/src/components/icons/icon-accessibility-circle.tsx @@ -9,7 +9,7 @@ export const IconAccessibilityCircle: FunctionalComponent = (props: I width={props.size ?? 16} onClick={props.onClick ? (event) => props.onClick(event) : null} viewBox="0 0 24 24" - fill={props.color ?? '#6A6976'} + fill={props.color ?? 'currentColor'} xmlns="http://www.w3.org/2000/svg"> diff --git a/stencil-workspace/src/components/icons/icon-add.tsx b/stencil-workspace/src/components/icons/icon-add.tsx index 9f3d50788..ea8aa9a80 100644 --- a/stencil-workspace/src/components/icons/icon-add.tsx +++ b/stencil-workspace/src/components/icons/icon-add.tsx @@ -9,8 +9,8 @@ export const IconAdd: FunctionalComponent = (props: IconProps) => ( width={props.size ?? 16} onClick={props.onClick ? (event) => props.onClick(event) : null} viewBox="0 0 24 24" - fill="none" + fill={props.color ?? 'currentColor'} xmlns="http://www.w3.org/2000/svg"> - + ); diff --git a/stencil-workspace/src/components/icons/icon-apps.tsx b/stencil-workspace/src/components/icons/icon-apps.tsx index a486a440d..d5cf48c4e 100644 --- a/stencil-workspace/src/components/icons/icon-apps.tsx +++ b/stencil-workspace/src/components/icons/icon-apps.tsx @@ -15,11 +15,8 @@ export const IconApps: FunctionalComponent = (props: IconProps) => ( width={props.size ?? 16} onClick={props.onClick ? (event) => props.onClick(event) : null} viewBox="0 0 24 24" - fill="none" + fill={props.color ?? 'currentColor'} xmlns="http://www.w3.org/2000/svg"> - + ); diff --git a/stencil-workspace/src/components/icons/icon-arrow-down.tsx b/stencil-workspace/src/components/icons/icon-arrow-down.tsx index 64289ac13..3655a4e09 100644 --- a/stencil-workspace/src/components/icons/icon-arrow-down.tsx +++ b/stencil-workspace/src/components/icons/icon-arrow-down.tsx @@ -12,13 +12,12 @@ interface IconProps { export const IconArrowDown: FunctionalComponent = (props: IconProps) => ( + viewBox="0 0 24 24" + width={props.size ?? 16} + xmlns="http://www.w3.org/2000/svg"> ); diff --git a/stencil-workspace/src/components/icons/icon-arrow-up.tsx b/stencil-workspace/src/components/icons/icon-arrow-up.tsx index a55cf3e0c..413393fb7 100644 --- a/stencil-workspace/src/components/icons/icon-arrow-up.tsx +++ b/stencil-workspace/src/components/icons/icon-arrow-up.tsx @@ -12,13 +12,13 @@ interface IconProps { export const IconArrowUp: FunctionalComponent = (props: IconProps) => ( + viewBox="0 0 24 24" + width={props.size ?? 16} + xmlns="http://www.w3.org/2000/svg"> {' '} ); diff --git a/stencil-workspace/src/components/icons/icon-calendar.tsx b/stencil-workspace/src/components/icons/icon-calendar.tsx index 7744bb776..cd01c164e 100644 --- a/stencil-workspace/src/components/icons/icon-calendar.tsx +++ b/stencil-workspace/src/components/icons/icon-calendar.tsx @@ -15,11 +15,8 @@ export const IconCalendar: FunctionalComponent = (props: IconProps) = width={props.size ?? 16} onClick={props.onClick ? (event) => props.onClick(event) : null} viewBox="0 0 24 24" - fill="none" + fill={props.color ?? 'currentColor'} xmlns="http://www.w3.org/2000/svg"> - + ); diff --git a/stencil-workspace/src/components/icons/icon-cancel.tsx b/stencil-workspace/src/components/icons/icon-cancel.tsx index dd2ee2ba9..2d2224d5b 100644 --- a/stencil-workspace/src/components/icons/icon-cancel.tsx +++ b/stencil-workspace/src/components/icons/icon-cancel.tsx @@ -9,18 +9,14 @@ interface IconProps { export const IconCancel: FunctionalComponent = (props: IconProps) => ( - - - - - - + viewBox="0 0 32 32" + width={props.size ?? 16} + xmlns="http://www.w3.org/2000/svg"> + + ); diff --git a/stencil-workspace/src/components/icons/icon-caret-down.tsx b/stencil-workspace/src/components/icons/icon-caret-down.tsx index 31fc8e10b..4137bd3aa 100644 --- a/stencil-workspace/src/components/icons/icon-caret-down.tsx +++ b/stencil-workspace/src/components/icons/icon-caret-down.tsx @@ -10,12 +10,12 @@ interface IconProps { export const IconCaretDown: FunctionalComponent = (props: IconProps) => ( + viewBox="0 0 24 24" + width={props.size ?? 16} + xmlns="http://www.w3.org/2000/svg"> ); diff --git a/stencil-workspace/src/components/icons/icon-caret-up.tsx b/stencil-workspace/src/components/icons/icon-caret-up.tsx index afde90b80..548e74973 100644 --- a/stencil-workspace/src/components/icons/icon-caret-up.tsx +++ b/stencil-workspace/src/components/icons/icon-caret-up.tsx @@ -10,12 +10,12 @@ interface IconProps { export const IconCaretUp: FunctionalComponent = (props: IconProps) => ( + viewBox="0 0 24 24" + width={props.size ?? 16} + xmlns="http://www.w3.org/2000/svg"> ); diff --git a/stencil-workspace/src/components/icons/icon-check-circle-outline.tsx b/stencil-workspace/src/components/icons/icon-check-circle-outline.tsx index 60e02ae1b..482043638 100644 --- a/stencil-workspace/src/components/icons/icon-check-circle-outline.tsx +++ b/stencil-workspace/src/components/icons/icon-check-circle-outline.tsx @@ -14,11 +14,8 @@ export const IconCheckCircleOutline: FunctionalComponent = (props: Ic width={props.size ?? 16} onClick={() => props.onClick()} viewBox="0 0 24 24" - fill="none" + fill={props.color ?? 'currentColor'} xmlns="http://www.w3.org/2000/svg"> - + ); diff --git a/stencil-workspace/src/components/icons/icon-check-circle.tsx b/stencil-workspace/src/components/icons/icon-check-circle.tsx index f769b766f..9305998da 100644 --- a/stencil-workspace/src/components/icons/icon-check-circle.tsx +++ b/stencil-workspace/src/components/icons/icon-check-circle.tsx @@ -14,11 +14,8 @@ export const IconCheckCircle: FunctionalComponent = (props: IconProps width={props.size ?? 16} onClick={() => props.onClick()} viewBox="0 0 24 24" - fill="none" + fill={props.color ?? 'currentColor'} xmlns="http://www.w3.org/2000/svg"> - + ); diff --git a/stencil-workspace/src/components/icons/icon-check.tsx b/stencil-workspace/src/components/icons/icon-check.tsx index b8848785a..831a07d8c 100644 --- a/stencil-workspace/src/components/icons/icon-check.tsx +++ b/stencil-workspace/src/components/icons/icon-check.tsx @@ -14,13 +14,12 @@ export const IconCheck: FunctionalComponent = (props: IconProps) => ( width={props.size ?? 16} onClick={props.onClick ? () => props.onClick() : null} viewBox="0 0 24 24" - fill="none" + fill={props.color ?? 'currentColor'} xmlns="http://www.w3.org/2000/svg"> ); diff --git a/stencil-workspace/src/components/icons/icon-chevron-double-down.tsx b/stencil-workspace/src/components/icons/icon-chevron-double-down.tsx index 86f173fb9..5e08cdb4d 100644 --- a/stencil-workspace/src/components/icons/icon-chevron-double-down.tsx +++ b/stencil-workspace/src/components/icons/icon-chevron-double-down.tsx @@ -4,7 +4,7 @@ import { IconProps } from './IconMap'; export const IconChevronDoubleDown: FunctionalComponent = (props: IconProps) => ( = (props: IconProps) => ( + viewBox="0 0 24 24" + width={props.size ?? 16} + xmlns="http://www.w3.org/2000/svg"> ); diff --git a/stencil-workspace/src/components/icons/icon-chevron-left-thick.tsx b/stencil-workspace/src/components/icons/icon-chevron-left-thick.tsx index 7374c97a5..ce71c8912 100644 --- a/stencil-workspace/src/components/icons/icon-chevron-left-thick.tsx +++ b/stencil-workspace/src/components/icons/icon-chevron-left-thick.tsx @@ -13,11 +13,8 @@ export const IconChevronLeftThick: FunctionalComponent = (props: Icon height={props.size ?? 16} width={props.size ?? 16} xmlns="http://www.w3.org/2000/svg" - fill="currentColor" + fill={props.color ?? 'currentColor'} viewBox="0 0 32 32"> - + ); diff --git a/stencil-workspace/src/components/icons/icon-chevron-right-thick.tsx b/stencil-workspace/src/components/icons/icon-chevron-right-thick.tsx index aeebed0f3..a4d279067 100644 --- a/stencil-workspace/src/components/icons/icon-chevron-right-thick.tsx +++ b/stencil-workspace/src/components/icons/icon-chevron-right-thick.tsx @@ -16,11 +16,6 @@ export const IconChevronRightThick: FunctionalComponent = (props: Ico width={props.size ?? 16} onClick={props.onClick} viewBox="0 0 32 32"> - - - + ); diff --git a/stencil-workspace/src/components/icons/icon-close.tsx b/stencil-workspace/src/components/icons/icon-close.tsx index c0099036f..79d617758 100644 --- a/stencil-workspace/src/components/icons/icon-close.tsx +++ b/stencil-workspace/src/components/icons/icon-close.tsx @@ -20,7 +20,7 @@ export const IconClose: FunctionalComponent = (props: IconProps) => ( diff --git a/stencil-workspace/src/components/icons/icon-collapse-all.tsx b/stencil-workspace/src/components/icons/icon-collapse-all.tsx index 4ad827873..953d7ecd5 100644 --- a/stencil-workspace/src/components/icons/icon-collapse-all.tsx +++ b/stencil-workspace/src/components/icons/icon-collapse-all.tsx @@ -9,12 +9,8 @@ export const IconCollapseAll: FunctionalComponent = (props: IconProps width={props.size ?? 16} onClick={props.onClick} viewBox="0 0 24 24" - fill="none" + fill={props.color ?? 'currentColor'} xmlns="http://www.w3.org/2000/svg"> - - + ); diff --git a/stencil-workspace/src/components/icons/icon-copy.tsx b/stencil-workspace/src/components/icons/icon-copy.tsx index 9ba2c2ec6..dbf56a551 100644 --- a/stencil-workspace/src/components/icons/icon-copy.tsx +++ b/stencil-workspace/src/components/icons/icon-copy.tsx @@ -9,12 +9,8 @@ export const IconCopy: FunctionalComponent = (props: IconProps) => ( width={props.size ?? 16} onClick={props.onClick} viewBox="0 0 24 24" - fill="none" + fill={props.color ?? 'currentColor'} xmlns="http://www.w3.org/2000/svg"> - - + ); diff --git a/stencil-workspace/src/components/icons/icon-drag-handle.tsx b/stencil-workspace/src/components/icons/icon-drag-handle.tsx index 186c308c2..0df6a74d2 100644 --- a/stencil-workspace/src/components/icons/icon-drag-handle.tsx +++ b/stencil-workspace/src/components/icons/icon-drag-handle.tsx @@ -21,13 +21,11 @@ export const IconDragHandle: FunctionalComponent = (props: IconProps) - - - - + + diff --git a/stencil-workspace/src/components/icons/icon-drag.tsx b/stencil-workspace/src/components/icons/icon-drag.tsx index 6eb54fcfa..1849c14ae 100644 --- a/stencil-workspace/src/components/icons/icon-drag.tsx +++ b/stencil-workspace/src/components/icons/icon-drag.tsx @@ -9,11 +9,8 @@ export const IconDrag: FunctionalComponent = (props: IconProps) => ( width={props.size ?? 16} onClick={props.onClick} viewBox="0 0 24 24" - fill="none" + fill={props.color ?? 'currentColor'} xmlns="http://www.w3.org/2000/svg"> - + ); diff --git a/stencil-workspace/src/components/icons/icon-edit.tsx b/stencil-workspace/src/components/icons/icon-edit.tsx index c25294b50..31e3aca52 100644 --- a/stencil-workspace/src/components/icons/icon-edit.tsx +++ b/stencil-workspace/src/components/icons/icon-edit.tsx @@ -9,12 +9,9 @@ export const IconEdit: FunctionalComponent = (props: IconProps) => ( width={props.size ?? 16} onClick={props.onClick} viewBox="0 0 24 24" - fill="none" + fill={props.color ?? 'currentColor'} xmlns="http://www.w3.org/2000/svg"> - + ); diff --git a/stencil-workspace/src/components/icons/icon-error.tsx b/stencil-workspace/src/components/icons/icon-error.tsx index bf4ff67fc..e9d575d2d 100644 --- a/stencil-workspace/src/components/icons/icon-error.tsx +++ b/stencil-workspace/src/components/icons/icon-error.tsx @@ -19,14 +19,14 @@ export const IconError: FunctionalComponent = (props: IconProps) => ( fill-rule="evenodd" clip-rule="evenodd" d="M3 12C3 7.032 7.032 3 12 3C16.968 3 21 7.032 21 12C21 16.968 16.968 21 12 21C7.032 21 3 16.968 3 12ZM12.9221 12.6706H11.078L10.7707 7.96292H13.2295L12.9221 12.6706ZM12.0001 16.0989C11.3264 16.0989 10.7823 15.5432 10.7823 14.8811C10.7823 14.2191 11.3264 13.6634 12.0001 13.6634C12.6738 13.6634 13.2178 14.2191 13.2178 14.8811C13.2178 15.5432 12.6738 16.0989 12.0001 16.0989Z" - fill={props.color ?? '#6A6976'} + fill={props.color ?? 'currentColor'} /> diff --git a/stencil-workspace/src/components/icons/icon-expand-all.tsx b/stencil-workspace/src/components/icons/icon-expand-all.tsx index e0168ff1a..4e3cf1f5a 100644 --- a/stencil-workspace/src/components/icons/icon-expand-all.tsx +++ b/stencil-workspace/src/components/icons/icon-expand-all.tsx @@ -9,12 +9,8 @@ export const IconExpandAll: FunctionalComponent = (props: IconProps) width={props.size ?? 16} onClick={props.onClick} viewBox="0 0 24 24" - fill="none" + fill={props.color ?? 'currentColor'} xmlns="http://www.w3.org/2000/svg"> - - + ); diff --git a/stencil-workspace/src/components/icons/icon-export.tsx b/stencil-workspace/src/components/icons/icon-export.tsx index 58ac99e3b..674a22ff3 100644 --- a/stencil-workspace/src/components/icons/icon-export.tsx +++ b/stencil-workspace/src/components/icons/icon-export.tsx @@ -4,13 +4,13 @@ import { IconProps } from './IconMap'; export const IconExport: FunctionalComponent = (props: IconProps) => ( + viewBox="0 0 24 24" + width={props.size ?? 16} + xmlns="http://www.w3.org/2000/svg"> ); diff --git a/stencil-workspace/src/components/icons/icon-file-bar-graph.tsx b/stencil-workspace/src/components/icons/icon-file-bar-graph.tsx index cd0e1d49b..1d61d3bda 100644 --- a/stencil-workspace/src/components/icons/icon-file-bar-graph.tsx +++ b/stencil-workspace/src/components/icons/icon-file-bar-graph.tsx @@ -9,7 +9,7 @@ export const IconFileBarGraph: FunctionalComponent = (props: IconProp width={props.size ?? 16} onClick={props.onClick ? (event) => props.onClick(event) : null} viewBox="0 0 24 24" - fill={props.color ?? '#6A6976'} + fill={props.color ?? 'currentColor'} xmlns="http://www.w3.org/2000/svg"> diff --git a/stencil-workspace/src/components/icons/icon-folder.tsx b/stencil-workspace/src/components/icons/icon-folder.tsx index c79cc09ac..6ba647bd8 100644 --- a/stencil-workspace/src/components/icons/icon-folder.tsx +++ b/stencil-workspace/src/components/icons/icon-folder.tsx @@ -11,7 +11,7 @@ export const IconFolder: FunctionalComponent = (props: IconProps) => diff --git a/stencil-workspace/src/components/icons/icon-help.tsx b/stencil-workspace/src/components/icons/icon-help.tsx index 0c3619978..119a90828 100644 --- a/stencil-workspace/src/components/icons/icon-help.tsx +++ b/stencil-workspace/src/components/icons/icon-help.tsx @@ -14,11 +14,8 @@ export const IconHelp: FunctionalComponent = (props: IconProps) => ( width={props.size ?? 16} onClick={props.onClick ? (event) => props.onClick(event) : null} viewBox="0 0 24 24" - fill="none" + fill={props.color ?? 'currentColor'} xmlns="http://www.w3.org/2000/svg"> - + ); diff --git a/stencil-workspace/src/components/icons/icon-history.tsx b/stencil-workspace/src/components/icons/icon-history.tsx index 0c65b5d94..3427e5c2d 100644 --- a/stencil-workspace/src/components/icons/icon-history.tsx +++ b/stencil-workspace/src/components/icons/icon-history.tsx @@ -4,13 +4,13 @@ import { IconProps } from './IconMap'; export const IconHistory: FunctionalComponent = (props: IconProps) => ( + viewBox="0 0 24 24" + width={props.size ?? 16} + xmlns="http://www.w3.org/2000/svg"> ); diff --git a/stencil-workspace/src/components/icons/icon-horizontal-ellipsis.tsx b/stencil-workspace/src/components/icons/icon-horizontal-ellipsis.tsx index 58fffc41a..6f7473f37 100644 --- a/stencil-workspace/src/components/icons/icon-horizontal-ellipsis.tsx +++ b/stencil-workspace/src/components/icons/icon-horizontal-ellipsis.tsx @@ -9,12 +9,13 @@ interface IconProps { export const IconHorizontalEllipsis: FunctionalComponent = (props: IconProps) => ( props.onClick() : null} - fill={props.color ?? '#6A6976'} - viewBox="0 0 24 24"> + viewBox="0 0 24 24" + width={props.size ?? 16} + xmlns="http://www.w3.org/2000/svg"> ); diff --git a/stencil-workspace/src/components/icons/icon-indeterminate.tsx b/stencil-workspace/src/components/icons/icon-indeterminate.tsx index 3abecdf5d..a8ffe9642 100644 --- a/stencil-workspace/src/components/icons/icon-indeterminate.tsx +++ b/stencil-workspace/src/components/icons/icon-indeterminate.tsx @@ -9,13 +9,13 @@ interface IconProps { export const IconIndeterminate: FunctionalComponent = (props: IconProps) => ( props.onClick() : null} - fill="none" + fill={props.color ?? 'currentColor'} xmlns="http://www.w3.org/2000/svg"> - + ); diff --git a/stencil-workspace/src/components/icons/icon-info-outline.tsx b/stencil-workspace/src/components/icons/icon-info-outline.tsx index ecb33ef9c..0b2b92e23 100644 --- a/stencil-workspace/src/components/icons/icon-info-outline.tsx +++ b/stencil-workspace/src/components/icons/icon-info-outline.tsx @@ -20,7 +20,7 @@ export const IconInfoOutline: FunctionalComponent = (props: IconProps fill-rule="evenodd" clip-rule="evenodd" d="M3 12C3 16.9631 7.03773 21 12 21C16.9623 21 21 16.9631 21 12C21 7.03773 16.9623 3 12 3C7.03773 3 3 7.03773 3 12ZM4.81555 12C4.81555 8.03836 8.03836 4.81555 12 4.81555C15.9616 4.81555 19.1845 8.03836 19.1845 12C19.1845 15.9616 15.9616 19.1845 12 19.1845C8.03836 19.1845 4.81555 15.9616 4.81555 12ZM11 17V11H13V17H11ZM11 7V9H13V7H11Z" - fill={props.color ?? '#6A6976'} + fill={props.color ?? 'currentColor'} /> = (props: IconProps) => ( fill-rule="evenodd" clip-rule="evenodd" d="M12 21C16.968 21 21 16.968 21 12C21 7.032 16.968 3 12 3C7.032 3 3 7.032 3 12C3 16.968 7.032 21 12 21ZM11 7H13V9H11V7ZM11 11H13L13 17H11L11 11Z" - fill={props.color ?? '#6A6976'} + fill={props.color ?? 'currentColor'} /> = (props: IconProps) => ( width={props.size ?? 16} onClick={props.onClick ? (event) => props.onClick(event) : null} viewBox="0 0 24 24" - fill="none" + fill={props.color ?? 'currentColor'} xmlns="http://www.w3.org/2000/svg"> - + ); diff --git a/stencil-workspace/src/components/icons/icon-moon.tsx b/stencil-workspace/src/components/icons/icon-moon.tsx index 233c577ee..17873a023 100644 --- a/stencil-workspace/src/components/icons/icon-moon.tsx +++ b/stencil-workspace/src/components/icons/icon-moon.tsx @@ -5,15 +5,12 @@ import { IconProps } from './IconMap'; export const IconMoon: FunctionalComponent = (props: IconProps) => ( - + ); diff --git a/stencil-workspace/src/components/icons/icon-notifications.tsx b/stencil-workspace/src/components/icons/icon-notifications.tsx index 392299141..5d0f7d545 100644 --- a/stencil-workspace/src/components/icons/icon-notifications.tsx +++ b/stencil-workspace/src/components/icons/icon-notifications.tsx @@ -15,11 +15,8 @@ export const IconNotifications: FunctionalComponent = (props: IconPro width={props.size ?? 16} onClick={props.onClick ? (event) => props.onClick(event) : null} viewBox="0 0 24 24" - fill="none" + fill={props.color ?? 'currentColor'} xmlns="http://www.w3.org/2000/svg"> - + ); diff --git a/stencil-workspace/src/components/icons/icon-pencil.tsx b/stencil-workspace/src/components/icons/icon-pencil.tsx index 6d91303f4..5d99adb3c 100644 --- a/stencil-workspace/src/components/icons/icon-pencil.tsx +++ b/stencil-workspace/src/components/icons/icon-pencil.tsx @@ -4,16 +4,13 @@ import { IconProps } from './IconMap'; export const IconPencil: FunctionalComponent = (props: IconProps) => ( - + ); diff --git a/stencil-workspace/src/components/icons/icon-pin.tsx b/stencil-workspace/src/components/icons/icon-pin.tsx index b6ab02bf3..b5031857c 100644 --- a/stencil-workspace/src/components/icons/icon-pin.tsx +++ b/stencil-workspace/src/components/icons/icon-pin.tsx @@ -9,11 +9,8 @@ export const IconPin: FunctionalComponent = (props: IconProps) => ( width={props.size ?? 16} onClick={props.onClick ? (event) => props.onClick(event) : null} viewBox="0 0 24 24" - fill="none" + fill={props.color ?? 'currentColor'} xmlns="http://www.w3.org/2000/svg"> - + ); diff --git a/stencil-workspace/src/components/icons/icon-refresh.tsx b/stencil-workspace/src/components/icons/icon-refresh.tsx index db5bcb07b..c93c63fc0 100644 --- a/stencil-workspace/src/components/icons/icon-refresh.tsx +++ b/stencil-workspace/src/components/icons/icon-refresh.tsx @@ -15,12 +15,8 @@ export const IconRefresh: FunctionalComponent = (props: IconProps) => width={props.size ?? 16} onClick={props.onClick ? (event) => props.onClick(event) : null} viewBox="0 0 24 24" - data-test-id="iconRefresh" - fill="none" + fill={props.color ?? 'currentColor'} xmlns="http://www.w3.org/2000/svg"> - + ); diff --git a/stencil-workspace/src/components/icons/icon-remove.tsx b/stencil-workspace/src/components/icons/icon-remove.tsx index 8a78d4152..b0207e8de 100644 --- a/stencil-workspace/src/components/icons/icon-remove.tsx +++ b/stencil-workspace/src/components/icons/icon-remove.tsx @@ -20,7 +20,7 @@ export const IconRemove: FunctionalComponent = (props: IconProps) => fill-rule="evenodd" clip-rule="evenodd" d="M3 12C3 7.03691 7.03691 3 12 3C16.9623 3 21 7.03691 21 12C21 16.9623 16.9623 21 12 21C7.03691 21 3 16.9623 3 12ZM15.8889 7L17 8.11113L13.1111 12L17 15.8889L15.8889 17L12 13.1111L8.11113 17L7 15.8889L10.8889 12L7 8.11113L8.11113 7L12 10.8889L15.8889 7Z" - fill={props.color ?? '#6A6976'} + fill={props.color ?? 'currentColor'} /> = (props: IconProps) => height={props.size ?? 14} onClick={props.onClick ? (event) => props.onClick(event) : null} viewBox="0 0 24 24" - fill="none" + fill={props.color ?? 'currentColor'} xmlns="http://www.w3.org/2000/svg"> - + ); diff --git a/stencil-workspace/src/components/icons/icon-shield.tsx b/stencil-workspace/src/components/icons/icon-shield.tsx index 4fd902a1d..5c790e282 100644 --- a/stencil-workspace/src/components/icons/icon-shield.tsx +++ b/stencil-workspace/src/components/icons/icon-shield.tsx @@ -9,11 +9,8 @@ export const IconShield: FunctionalComponent = (props: IconProps) => width={props.size ?? 16} onClick={props.onClick ? (event) => props.onClick(event) : null} viewBox="0 0 24 24" - fill="none" + fill={props.color ?? 'currentColor'} xmlns="http://www.w3.org/2000/svg"> - + ); diff --git a/stencil-workspace/src/components/icons/icon-sort-a-z.tsx b/stencil-workspace/src/components/icons/icon-sort-a-z.tsx index bfe4895bf..999c8e06f 100644 --- a/stencil-workspace/src/components/icons/icon-sort-a-z.tsx +++ b/stencil-workspace/src/components/icons/icon-sort-a-z.tsx @@ -9,13 +9,13 @@ interface IconProps { export const IconSortAZ: FunctionalComponent = (props: IconProps) => ( + viewBox="0 0 32 32" + width={props.size ?? 16} + xmlns="http://www.w3.org/2000/svg"> ); diff --git a/stencil-workspace/src/components/icons/icon-sort-z-a.tsx b/stencil-workspace/src/components/icons/icon-sort-z-a.tsx index cfe0ff248..6c54a55a5 100644 --- a/stencil-workspace/src/components/icons/icon-sort-z-a.tsx +++ b/stencil-workspace/src/components/icons/icon-sort-z-a.tsx @@ -9,12 +9,12 @@ interface IconProps { export const IconSortZA: FunctionalComponent = (props: IconProps) => ( diff --git a/stencil-workspace/src/components/icons/icon-sun.tsx b/stencil-workspace/src/components/icons/icon-sun.tsx index 49e9342e4..27419853f 100644 --- a/stencil-workspace/src/components/icons/icon-sun.tsx +++ b/stencil-workspace/src/components/icons/icon-sun.tsx @@ -9,11 +9,8 @@ export const IconSun: FunctionalComponent = (props: IconProps) => ( width={props.size ?? 16} onClick={props.onClick} viewBox="0 0 24 24" - fill="none" + fill={props.color ?? 'currentColor'} xmlns="http://www.w3.org/2000/svg"> - + ); diff --git a/stencil-workspace/src/components/icons/icon-timer-countdown.tsx b/stencil-workspace/src/components/icons/icon-timer-countdown.tsx index 0d657078c..36b4797ae 100644 --- a/stencil-workspace/src/components/icons/icon-timer-countdown.tsx +++ b/stencil-workspace/src/components/icons/icon-timer-countdown.tsx @@ -5,15 +5,12 @@ import { IconProps } from './IconMap'; export const IconTimerCountdown: FunctionalComponent = (props: IconProps) => ( props.onClick(event) : null} viewBox="0 0 24 24" - fill="none" + width={props.size ?? 16} xmlns="http://www.w3.org/2000/svg"> - + ); diff --git a/stencil-workspace/src/components/icons/icon-triangle-down.tsx b/stencil-workspace/src/components/icons/icon-triangle-down.tsx index 571708e2c..205a60642 100644 --- a/stencil-workspace/src/components/icons/icon-triangle-down.tsx +++ b/stencil-workspace/src/components/icons/icon-triangle-down.tsx @@ -14,8 +14,8 @@ export const IconTriangleDown: FunctionalComponent = (props: IconProp width={props.size ?? 16} onClick={props.onClick} viewBox="0 0 10 6" - fill="none" + fill={props.color ?? 'currentColor'} xmlns="http://www.w3.org/2000/svg"> - + ); diff --git a/stencil-workspace/src/components/icons/icon-triangle-left.tsx b/stencil-workspace/src/components/icons/icon-triangle-left.tsx index 8567af876..0185e8ea9 100644 --- a/stencil-workspace/src/components/icons/icon-triangle-left.tsx +++ b/stencil-workspace/src/components/icons/icon-triangle-left.tsx @@ -14,8 +14,8 @@ export const IconTriangleLeft: FunctionalComponent = (props: IconProp width={props.size ?? 16} onClick={() => props.onClick()} viewBox="0 0 24 24" - fill="none" + fill={props.color ?? 'currentColor'} xmlns="http://www.w3.org/2000/svg"> - + ); diff --git a/stencil-workspace/src/components/icons/icon-tune.tsx b/stencil-workspace/src/components/icons/icon-tune.tsx index ee0c6f4b4..5bedea193 100644 --- a/stencil-workspace/src/components/icons/icon-tune.tsx +++ b/stencil-workspace/src/components/icons/icon-tune.tsx @@ -10,12 +10,12 @@ interface IconProps { export const IconTune: FunctionalComponent = (props: IconProps) => ( + viewBox="0 0 24 24" + width={props.size ?? 16} + xmlns="http://www.w3.org/2000/svg"> ); diff --git a/stencil-workspace/src/components/icons/icon-upload-cloud.tsx b/stencil-workspace/src/components/icons/icon-upload-cloud.tsx index 832375802..5626b818d 100644 --- a/stencil-workspace/src/components/icons/icon-upload-cloud.tsx +++ b/stencil-workspace/src/components/icons/icon-upload-cloud.tsx @@ -9,13 +9,13 @@ interface IconProps { export const IconUploadCloud: FunctionalComponent = (props: IconProps) => ( + viewBox="0 0 24 24" + width={props.size ?? 16} + xmlns="http://www.w3.org/2000/svg"> ); diff --git a/stencil-workspace/src/components/icons/icon-vertical-ellipsis.tsx b/stencil-workspace/src/components/icons/icon-vertical-ellipsis.tsx index 0cbacdd9a..924b0fb21 100644 --- a/stencil-workspace/src/components/icons/icon-vertical-ellipsis.tsx +++ b/stencil-workspace/src/components/icons/icon-vertical-ellipsis.tsx @@ -9,11 +9,12 @@ interface IconProps { export const IconVerticalEllipsis: FunctionalComponent = (props: IconProps) => ( props.onClick() : null} viewBox="0 0 24 24" + width={props.size ?? 16} xmlns="http://www.w3.org/2000/svg"> diff --git a/stencil-workspace/src/components/icons/icon-visibility-off.tsx b/stencil-workspace/src/components/icons/icon-visibility-off.tsx index efd707c89..5eb0ac0be 100644 --- a/stencil-workspace/src/components/icons/icon-visibility-off.tsx +++ b/stencil-workspace/src/components/icons/icon-visibility-off.tsx @@ -9,7 +9,7 @@ interface IconProps { export const IconVisibilityOff: FunctionalComponent = (props: IconProps) => ( = (props: IconProps) => ( = (props: IconPr fill-rule="evenodd" clip-rule="evenodd" d="M12 4.68605C11.6138 4.68605 11.268 4.88157 11.0752 5.20881L3.82989 17.5336C3.64191 17.8533 3.63917 18.2368 3.82371 18.5592C4.01512 18.8934 4.36295 19.093 4.75468 19.093H19.2453C19.6371 19.093 19.9849 18.8934 20.1763 18.5592C20.3608 18.2375 20.3581 17.8533 20.1701 17.5336L12.9248 5.20881C12.732 4.88157 12.3869 4.68605 12 4.68605ZM19.2453 19.779H4.75468C4.11391 19.779 3.54312 19.4504 3.22823 18.9002C2.92019 18.3617 2.92431 17.7209 3.23852 17.1865L10.4838 4.86167C10.8008 4.32244 11.3675 4 12 4C12.6325 4 13.1999 4.32244 13.5162 4.86167L20.7615 17.1865C21.0757 17.7209 21.0798 18.3617 20.7718 18.9002C20.4569 19.4504 19.8861 19.779 19.2453 19.779ZM12.0001 17.0989C11.3264 17.0989 10.7823 16.5432 10.7823 15.8811C10.7823 15.2191 11.3264 14.6634 12.0001 14.6634C12.6738 14.6634 13.2178 15.2191 13.2178 15.8811C13.2178 16.5432 12.6738 17.0989 12.0001 17.0989ZM11.078 13.6706H12.9221L13.2295 8.96292H10.7707L11.078 13.6706Z" - fill={props.color ?? '#6A6976'} + fill={props.color ?? 'currentColor'} /> diff --git a/stencil-workspace/src/components/icons/icon-warning.tsx b/stencil-workspace/src/components/icons/icon-warning.tsx index 556328e92..aab5157ad 100644 --- a/stencil-workspace/src/components/icons/icon-warning.tsx +++ b/stencil-workspace/src/components/icons/icon-warning.tsx @@ -14,13 +14,12 @@ export const IconWarning: FunctionalComponent = (props: IconProps) => width={props.size ?? 16} onClick={() => props.onClick()} viewBox="0 0 24 24" - fill="none" + fill={props.color ?? 'currentColor'} xmlns="http://www.w3.org/2000/svg"> ); diff --git a/stencil-workspace/src/components/icons/icon.spec.tsx b/stencil-workspace/src/components/icons/icon.spec.tsx index 6dba88351..0dbcffc83 100644 --- a/stencil-workspace/src/components/icons/icon.spec.tsx +++ b/stencil-workspace/src/components/icons/icon.spec.tsx @@ -11,8 +11,8 @@ describe('icon-triangle-down', () => { const page = await renderFunctionalComponentToSpecPage(); expect(page.root).toEqualHtml(` - - + + `); }); @@ -21,8 +21,8 @@ describe('icon-triangle-down', () => { const page = await renderFunctionalComponentToSpecPage(); expect(page.root).toEqualHtml(` - - + + `); }); @@ -39,7 +39,7 @@ describe('icon-accessibility-circle', () => { const page = await renderFunctionalComponentToSpecPage(); expect(page.root).toEqualHtml(` - + `); @@ -49,7 +49,7 @@ describe('icon-accessibility-circle', () => { const page = await renderFunctionalComponentToSpecPage(); expect(page.root).toEqualHtml(` - + `); @@ -67,7 +67,7 @@ describe('icon-file-bar-graph', () => { const page = await renderFunctionalComponentToSpecPage(); expect(page.root).toEqualHtml(` - + `); @@ -77,7 +77,7 @@ describe('icon-file-bar-graph', () => { const page = await renderFunctionalComponentToSpecPage(); expect(page.root).toEqualHtml(` - + `); diff --git a/stencil-workspace/src/components/modus-button/modus-button.spec.ts b/stencil-workspace/src/components/modus-button/modus-button.spec.ts index b257a1b02..f044a9cce 100644 --- a/stencil-workspace/src/components/modus-button/modus-button.spec.ts +++ b/stencil-workspace/src/components/modus-button/modus-button.spec.ts @@ -48,7 +48,7 @@ describe('modus-button', () => { + diff --git a/stencil-workspace/src/components/modus-checkbox/modus-checkbox.spec.tsx b/stencil-workspace/src/components/modus-checkbox/modus-checkbox.spec.tsx index 819c24112..f55a9665d 100644 --- a/stencil-workspace/src/components/modus-checkbox/modus-checkbox.spec.tsx +++ b/stencil-workspace/src/components/modus-checkbox/modus-checkbox.spec.tsx @@ -13,7 +13,7 @@ describe('modus-checkbox', () => {
- +
diff --git a/stencil-workspace/src/components/modus-content-tree/modus-content-tree.spec.tsx b/stencil-workspace/src/components/modus-content-tree/modus-content-tree.spec.tsx index 99a1f9dff..451075a90 100644 --- a/stencil-workspace/src/components/modus-content-tree/modus-content-tree.spec.tsx +++ b/stencil-workspace/src/components/modus-content-tree/modus-content-tree.spec.tsx @@ -36,7 +36,7 @@ describe('modus-tree-view-item', () => {
diff --git a/stencil-workspace/src/components/modus-file-dropzone/modus-file-dropzone.spec.ts b/stencil-workspace/src/components/modus-file-dropzone/modus-file-dropzone.spec.ts index 723337174..91fb5f470 100644 --- a/stencil-workspace/src/components/modus-file-dropzone/modus-file-dropzone.spec.ts +++ b/stencil-workspace/src/components/modus-file-dropzone/modus-file-dropzone.spec.ts @@ -17,7 +17,7 @@ describe('modus-file-dropzone', () => {
- +
diff --git a/stencil-workspace/src/components/modus-message/modus-message.spec.ts b/stencil-workspace/src/components/modus-message/modus-message.spec.ts index 4da0276e4..f460c5d4b 100644 --- a/stencil-workspace/src/components/modus-message/modus-message.spec.ts +++ b/stencil-workspace/src/components/modus-message/modus-message.spec.ts @@ -13,7 +13,7 @@ describe('modus-message', () => {
- + diff --git a/stencil-workspace/src/components/modus-modal/modus-modal.spec.ts b/stencil-workspace/src/components/modus-modal/modus-modal.spec.ts index 8acd41284..6aa06c454 100644 --- a/stencil-workspace/src/components/modus-modal/modus-modal.spec.ts +++ b/stencil-workspace/src/components/modus-modal/modus-modal.spec.ts @@ -17,7 +17,7 @@ describe('modus-modal', () => {
- + diff --git a/stencil-workspace/src/components/modus-sentiment-scale/modus-sentiment-scale.tsx b/stencil-workspace/src/components/modus-sentiment-scale/modus-sentiment-scale.tsx index 8330b37b2..262d1637e 100644 --- a/stencil-workspace/src/components/modus-sentiment-scale/modus-sentiment-scale.tsx +++ b/stencil-workspace/src/components/modus-sentiment-scale/modus-sentiment-scale.tsx @@ -1,3 +1,4 @@ +// eslint-disable-next-line import { Component, Prop, State, h, Event, EventEmitter } from '@stencil/core'; import { IconMap } from '../icons/IconMap'; import { diff --git a/stencil-workspace/src/components/modus-toast/modus-toast.spec.ts b/stencil-workspace/src/components/modus-toast/modus-toast.spec.ts index 4473d16d5..916c5e6d6 100644 --- a/stencil-workspace/src/components/modus-toast/modus-toast.spec.ts +++ b/stencil-workspace/src/components/modus-toast/modus-toast.spec.ts @@ -13,7 +13,7 @@ describe('modus-toast', () => {
- + From aec22dd1b95715b212e61f4ad91b38abaf95a583 Mon Sep 17 00:00:00 2001 From: coliff Date: Tue, 12 Dec 2023 23:14:14 +0900 Subject: [PATCH 2/3] fix tests --- stencil-workspace/src/components/icons/icon-check.tsx | 3 ++- .../src/components/modus-checkbox/modus-checkbox.spec.tsx | 2 +- .../components/modus-content-tree/modus-content-tree.spec.tsx | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/stencil-workspace/src/components/icons/icon-check.tsx b/stencil-workspace/src/components/icons/icon-check.tsx index 831a07d8c..b8848785a 100644 --- a/stencil-workspace/src/components/icons/icon-check.tsx +++ b/stencil-workspace/src/components/icons/icon-check.tsx @@ -14,12 +14,13 @@ export const IconCheck: FunctionalComponent = (props: IconProps) => ( width={props.size ?? 16} onClick={props.onClick ? () => props.onClick() : null} viewBox="0 0 24 24" - fill={props.color ?? 'currentColor'} + fill="none" xmlns="http://www.w3.org/2000/svg"> ); diff --git a/stencil-workspace/src/components/modus-checkbox/modus-checkbox.spec.tsx b/stencil-workspace/src/components/modus-checkbox/modus-checkbox.spec.tsx index f55a9665d..819c24112 100644 --- a/stencil-workspace/src/components/modus-checkbox/modus-checkbox.spec.tsx +++ b/stencil-workspace/src/components/modus-checkbox/modus-checkbox.spec.tsx @@ -13,7 +13,7 @@ describe('modus-checkbox', () => {
- +
diff --git a/stencil-workspace/src/components/modus-content-tree/modus-content-tree.spec.tsx b/stencil-workspace/src/components/modus-content-tree/modus-content-tree.spec.tsx index 451075a90..2a014f600 100644 --- a/stencil-workspace/src/components/modus-content-tree/modus-content-tree.spec.tsx +++ b/stencil-workspace/src/components/modus-content-tree/modus-content-tree.spec.tsx @@ -37,7 +37,7 @@ describe('modus-tree-view-item', () => {
From 1d9cc9cb4b8864d8d22d556e6e87c766122ff6cb Mon Sep 17 00:00:00 2001 From: coliff Date: Wed, 13 Dec 2023 15:15:43 +0900 Subject: [PATCH 3/3] Update icon-indeterminate.tsx --- .../src/components/icons/icon-indeterminate.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/stencil-workspace/src/components/icons/icon-indeterminate.tsx b/stencil-workspace/src/components/icons/icon-indeterminate.tsx index 21becd41d..b7da422ee 100644 --- a/stencil-workspace/src/components/icons/icon-indeterminate.tsx +++ b/stencil-workspace/src/components/icons/icon-indeterminate.tsx @@ -16,6 +16,10 @@ export const IconIndeterminate: FunctionalComponent = (props: IconPro onClick={props.onClick ? () => props.onClick() : null} fill={props.color ?? 'currentColor'} xmlns="http://www.w3.org/2000/svg"> - + );