fix(action): Add slotChildNodesFix to stencil config extras (#890)

* add extra to config for default slot info * update to check for slot length * getSlotted cleanup
Esri · Mar 25, 2020 · 99717d3 · 99717d3
1 parent f8c6222
commit 99717d3
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/src/components/calcite-action/calcite-action.tsx b/src/components/calcite-action/calcite-action.tsx
@@ -130,7 +130,7 @@ export class CalciteAction {
     const calciteLoaderNode = loading ? <calcite-loader is-active inline /> : null;
     const calciteIconNode = icon ? <calcite-icon icon={icon} scale={iconScale} /> : null;
     const iconNode = calciteLoaderNode || calciteIconNode;
-    const hasIconToDisplay = iconNode || el.querySelector("calcite-icon, svg");
+    const hasIconToDisplay = iconNode || el.children?.length;
 
     const slotContainerNode = (
       <div

diff --git a/src/components/calcite-flow-item/calcite-flow-item.tsx b/src/components/calcite-flow-item/calcite-flow-item.tsx
@@ -368,7 +368,7 @@ export class CalciteFlowItem {
   }
 
   renderFab(): VNode {
-    const hasFab = this.el.querySelector(`[slot=${SLOTS.fab}]`);
+    const hasFab = getSlotted(this.el, SLOTS.fab);
     return hasFab ? (
       <div class={CSS.fabContainer} slot={PANEL_SLOTS.fab}>
         <slot name={SLOTS.fab} />

diff --git a/src/components/calcite-panel/calcite-panel.tsx b/src/components/calcite-panel/calcite-panel.tsx
@@ -240,7 +240,7 @@ export class CalcitePanel {
   }
 
   renderFab(): VNode {
-    const hasFab = this.el.querySelector(`[slot=${SLOTS.fab}]`);
+    const hasFab = getSlotted(this.el, SLOTS.fab);
 
     return hasFab ? (
       <div class={CSS.fabContainer}>

diff --git a/stencil.config.ts b/stencil.config.ts
@@ -61,7 +61,8 @@ export const create: () => Config = () => ({
   excludeSrc: DEFAULT_EXCLUDE_SRC,
   srcIndexHtml: "src/index.html",
   extras: {
-    appendChildSlotFix: true
+    appendChildSlotFix: true,
+    slotChildNodesFix: true
   }
 });