fix(pick-list, value-list): Fix icon for selected circle #911

Esri · Apr 2, 2020 · 167e729 · 167e729
1 parent 94476e9
commit 167e729
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/src/components/calcite-pick-list-item/calcite-pick-list-item.tsx b/src/components/calcite-pick-list-item/calcite-pick-list-item.tsx
@@ -231,17 +231,11 @@ export class CalcitePickListItem {
     }
 
     const iconName =
-      icon === ICON_TYPES.square
-        ? selected
-          ? ICONS.checked
-          : ICONS.unchecked
-        : selected
-        ? ICONS.selected
-        : ICONS.unselected;
+      icon === ICON_TYPES.circle ? ICONS.circle : selected ? ICONS.checked : ICONS.unchecked;
 
     return (
       <span class={CSS.icon}>
-        <calcite-icon scale="s" icon={iconName} />
+        <calcite-icon filled={iconName === ICONS.circle && selected} scale="s" icon={iconName} />
       </span>
     );
   }

diff --git a/src/components/calcite-pick-list-item/resources.ts b/src/components/calcite-pick-list-item/resources.ts
@@ -14,8 +14,7 @@ export const CSS = {
 export const ICONS = {
   unchecked: "square",
   checked: "check",
-  selected: "circle-filled",
-  unselected: "circle",
+  circle: "circle",
   remove: "x"
 };