docs: fix nested accordion demo, panel accessor set check is enough

hperrin · hperrin · commit dc45637f20fe · 2022-07-23T09:56:44.000-07:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "lerna": "^5.2.0",
     "prettier": "~2.7.1",
     "prettier-plugin-svelte": "^2.7.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte": "^3.49.0",
     "svelte-check": "^2.8.0"
   }
diff --git a/packages/accordion/package.json b/packages/accordion/package.json
@@ -51,7 +51,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/accordion/src/Accordion.svelte b/packages/accordion/src/Accordion.svelte
@@ -43,19 +43,9 @@
   let withOpenDialog = false;
 
   function handlePanelMount(event: CustomEvent<SMUIAccordionPanelAccessor>) {
-    // To make nested accordions work, ensure event sender is a direct child of
-    // this accordion.
-    if (
-      event.target &&
-      'parentNode' in event.target &&
-      (event.target as Element).parentNode != element
-    ) {
-      // TODO: debug why "as Element" is necessary.
-      return;
-    }
-
     const accessor = event.detail;
 
+    // Stop propagation so accordion's above this one don't receive the event.
     event.stopPropagation();
 
     if (!multiple && accessor.open) {
@@ -79,6 +69,7 @@
       return;
     }
 
+    // Stop propagation so accordion's above this one don't receive the event.
     event.stopPropagation();
 
     panelAccessorSet.delete(accessor);
diff --git a/packages/autocomplete/package.json b/packages/autocomplete/package.json
@@ -50,7 +50,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/badge/package.json b/packages/badge/package.json
@@ -48,7 +48,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/banner/package.json b/packages/banner/package.json
@@ -44,7 +44,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/button/package.json b/packages/button/package.json
@@ -49,7 +49,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/card/package.json b/packages/card/package.json
@@ -49,7 +49,7 @@
     "@material/button": "^13.0.0",
     "@material/icon-button": "^13.0.0",
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/checkbox/package.json b/packages/checkbox/package.json
@@ -45,7 +45,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/chips/package.json b/packages/chips/package.json
@@ -47,7 +47,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/circular-progress/package.json b/packages/circular-progress/package.json
@@ -44,7 +44,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -57,7 +57,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/data-table/package.json b/packages/data-table/package.json
@@ -49,7 +49,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/dialog/package.json b/packages/dialog/package.json
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/drawer/package.json b/packages/drawer/package.json
@@ -45,7 +45,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/fab/package.json b/packages/fab/package.json
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/floating-label/package.json b/packages/floating-label/package.json
@@ -44,7 +44,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/form-field/package.json b/packages/form-field/package.json
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/icon-button/package.json b/packages/icon-button/package.json
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/image-list/package.json b/packages/image-list/package.json
@@ -44,7 +44,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/layout-grid/package.json b/packages/layout-grid/package.json
@@ -44,7 +44,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/line-ripple/package.json b/packages/line-ripple/package.json
@@ -44,7 +44,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/linear-progress/package.json b/packages/linear-progress/package.json
@@ -44,7 +44,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/list/package.json b/packages/list/package.json
@@ -47,7 +47,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/menu-surface/package.json b/packages/menu-surface/package.json
@@ -45,7 +45,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/menu/package.json b/packages/menu/package.json
@@ -47,7 +47,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/notched-outline/package.json b/packages/notched-outline/package.json
@@ -45,7 +45,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/paper/package.json b/packages/paper/package.json
@@ -48,7 +48,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/radio/package.json b/packages/radio/package.json
@@ -45,7 +45,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/ripple/package.json b/packages/ripple/package.json
@@ -45,7 +45,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/segmented-button/package.json b/packages/segmented-button/package.json
@@ -45,7 +45,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/select/package.json b/packages/select/package.json
@@ -71,7 +71,7 @@
   },
   "devDependencies": {
     "@tsconfig/svelte": "^3.0.0",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "svelte-strip": "^1.0.1",
     "tslib": "^2.4.0",
     "typescript": "^4.7.4"
diff --git a/packages/site/package.json b/packages/site/package.json
@@ -83,12 +83,12 @@
     "@smui/top-app-bar": "^6.0.0-beta.16",
     "@smui/touch-target": "^6.0.0-beta.16",
     "@sveltejs/adapter-static": "^1.0.0-next.38",
-    "@sveltejs/kit": "^1.0.0-next.391",
+    "@sveltejs/kit": "^1.0.0-next.392",
     "highlight.js": "^11.6.0",
     "highlightjs-svelte": "^1.0.6",
     "mdsvex": "^0.10.6",
     "remark-slug": "^7.0.1",
-    "sass": "^1.53.0",
+    "sass": "^1.54.0",
     "simple-icons": "^7.4.0",
     "smui-theme": "^6.0.0-beta.16",
     "svelte-preprocess": "^4.10.7",
diff --git a/packages/site/src/routes/demo/accordion/_Nested.svelte b/packages/site/src/routes/demo/accordion/_Nested.svelte
diff --git a/packages/site/src/routes/demo/accordion/index.svelte b/packages/site/src/routes/demo/accordion/index.svelte
diff --git a/packages/slider/package.json b/packages/slider/package.json
diff --git a/packages/smui-theme/package.json b/packages/smui-theme/package.json
diff --git a/packages/snackbar/package.json b/packages/snackbar/package.json
diff --git a/packages/switch/package.json b/packages/switch/package.json
diff --git a/packages/tab-bar/package.json b/packages/tab-bar/package.json
diff --git a/packages/tab-indicator/package.json b/packages/tab-indicator/package.json
diff --git a/packages/tab-scroller/package.json b/packages/tab-scroller/package.json
diff --git a/packages/tab/package.json b/packages/tab/package.json
diff --git a/packages/textfield/package.json b/packages/textfield/package.json
diff --git a/packages/tooltip/package.json b/packages/tooltip/package.json
diff --git a/packages/top-app-bar/package.json b/packages/top-app-bar/package.json
diff --git a/packages/touch-target/package.json b/packages/touch-target/package.json

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`"lerna": "^5.2.0",`
`40`	`40`	`"prettier": "~2.7.1",`
`41`	`41`	`"prettier-plugin-svelte": "^2.7.0",`
`42`		`- "sass": "^1.53.0",`
	`42`	`+ "sass": "^1.54.0",`
`43`	`43`	`"svelte": "^3.49.0",`
`44`	`44`	`"svelte-check": "^2.8.0"`
`45`	`45`	`}`