fix(action-bar): removed default return from getCalcitePosition

* removed default return from getCalcitePosition * Updated getClosestShellPosition
Esri · Feb 28, 2020 · 5a1fa28 · 5a1fa28
1 parent 1436195
commit 5a1fa28
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/components/utils/CalciteExpandToggle.tsx b/src/components/utils/CalciteExpandToggle.tsx
@@ -18,12 +18,15 @@ const ICONS = {
 
 function getClosestShellPosition(el: HTMLElement): CalcitePosition | null {
   const shellNode = el.closest("calcite-shell-panel");
-
   if (!shellNode) {
     return;
   }
-
-  return shellNode.position;
+  if (shellNode.position) {
+    return shellNode.position;
+  }
+  if (shellNode.layout) {
+    return shellNode.layout === "trailing" ? "end" : "start";
+  }
 }
 
 function getCalcitePosition(position: CalcitePosition, el: HTMLElement) {

diff --git a/src/components/utils/dom.ts b/src/components/utils/dom.ts
@@ -29,8 +29,6 @@ export function getCalcitePosition(position: CalcitePosition, layout: CalciteLay
   if (layout) {
     return layout === "trailing" ? "end" : "start";
   }
-
-  return "start";
 }
 
 export function getSlotted<T extends Element = Element>(element: Element, slotName: string): T[] {