Fix target ids in Toggler.

Swaps logic for DropDownParent and CollapseParent Since a dropdown is commonly in a collapse but why on earth would you put a collapse in a dropdown?
chanan · Jun 2, 2023 · 36e50be · 36e50be
1 parent 05d4dbe
commit 36e50be
Show file tree

Hide file tree

Showing 27 changed files with 8 additions and 10 deletions.
diff --git a/docs/VNext/_content/BlazorStrap/blazorstrapinterop.js b/docs/VNext/_content/BlazorStrap/blazorstrapinterop.js
@@ -727,7 +727,6 @@ function setupDocumentEvents(dotnet) {
                 .filter(element => element.classList.contains('show'))
                 .map(element => element);
             var canInvoke = true;
-
             relatedIds = [];
             if (relatedShown.length > 0) {
                 relatedShown.forEach(x => {

diff --git a/docs/VNext/_framework/BlazorStrap-Docs.dll b/docs/VNext/_framework/BlazorStrap-Docs.dll
diff --git a/docs/VNext/_framework/BlazorStrap-Docs.dll.br b/docs/VNext/_framework/BlazorStrap-Docs.dll.br
diff --git a/docs/VNext/_framework/BlazorStrap-Docs.dll.gz b/docs/VNext/_framework/BlazorStrap-Docs.dll.gz
diff --git a/docs/VNext/_framework/BlazorStrap-Docs.pdb.gz b/docs/VNext/_framework/BlazorStrap-Docs.pdb.gz
diff --git a/docs/VNext/_framework/BlazorStrap.V4.dll b/docs/VNext/_framework/BlazorStrap.V4.dll
diff --git a/docs/VNext/_framework/BlazorStrap.V4.dll.br b/docs/VNext/_framework/BlazorStrap.V4.dll.br
diff --git a/docs/VNext/_framework/BlazorStrap.V4.dll.gz b/docs/VNext/_framework/BlazorStrap.V4.dll.gz
diff --git a/docs/VNext/_framework/BlazorStrap.V4.pdb.gz b/docs/VNext/_framework/BlazorStrap.V4.pdb.gz
diff --git a/docs/VNext/_framework/BlazorStrap.V5.dll b/docs/VNext/_framework/BlazorStrap.V5.dll
diff --git a/docs/VNext/_framework/BlazorStrap.V5.dll.br b/docs/VNext/_framework/BlazorStrap.V5.dll.br
diff --git a/docs/VNext/_framework/BlazorStrap.V5.dll.gz b/docs/VNext/_framework/BlazorStrap.V5.dll.gz
diff --git a/docs/VNext/_framework/BlazorStrap.V5.pdb.gz b/docs/VNext/_framework/BlazorStrap.V5.pdb.gz
diff --git a/docs/VNext/_framework/BlazorStrap.WASM.dll b/docs/VNext/_framework/BlazorStrap.WASM.dll
diff --git a/docs/VNext/_framework/BlazorStrap.WASM.dll.br b/docs/VNext/_framework/BlazorStrap.WASM.dll.br
diff --git a/docs/VNext/_framework/BlazorStrap.WASM.dll.gz b/docs/VNext/_framework/BlazorStrap.WASM.dll.gz
diff --git a/docs/VNext/_framework/BlazorStrap.WASM.pdb.gz b/docs/VNext/_framework/BlazorStrap.WASM.pdb.gz
diff --git a/docs/VNext/_framework/BlazorStrap.dll b/docs/VNext/_framework/BlazorStrap.dll
diff --git a/docs/VNext/_framework/BlazorStrap.dll.br b/docs/VNext/_framework/BlazorStrap.dll.br
diff --git a/docs/VNext/_framework/BlazorStrap.dll.gz b/docs/VNext/_framework/BlazorStrap.dll.gz
diff --git a/docs/VNext/_framework/BlazorStrap.pdb.gz b/docs/VNext/_framework/BlazorStrap.pdb.gz
diff --git a/docs/VNext/_framework/blazor.boot.json b/docs/VNext/_framework/blazor.boot.json
@@ -8,14 +8,14 @@
   "resources": {
     "assembly": {
       "BlazorComponentUtilities.dll": "sha256-UapksNiQg3lu5QM9uVSLyjEuzRH\/7o22fmcmxcLAAeI=",
-      "BlazorStrap.dll": "sha256-tQTkQxifgjX4C9hjphnOSDuygSeEPJxp3pFwLtRph50=",
+      "BlazorStrap.dll": "sha256-djeUXj\/pec\/VewGxxMW+qm8e\/+5iwZ5F32ih67moDBM=",
       "BlazorStrap.Extensions.FluentValidation.dll": "sha256-BzhF3enm19S\/hDwxJuWjJ+PiCPNYesAuAjudTtvh70s=",
       "BlazorStrap.Extensions.TreeView.dll": "sha256-lZdsF5d8dnhPvoIV4xPpp4k4X6jFdTu\/agY4ExWxwg8=",
       "BlazorStrap.Extensions.Wizard.dll": "sha256-c\/KTfBSCLKE7\/LdjOApOl8Lj5LttHa0ocUz0ICjhvd0=",
-      "BlazorStrap.V4.dll": "sha256-8\/UOVE5BIK19HqjIOw935KIMrOL8gBtAE\/Unkb9WLpM=",
-      "BlazorStrap.V5.dll": "sha256-yCgQauo5YCuuRdPdxoXF8wBX0WFMmsks8YgqV6gReAc=",
-      "BlazorStrap.WASM.dll": "sha256-9tiToKw6Eu+QCwwwkRkj6T5mnav32qPy5p60iMjlNn0=",
-      "BlazorStrap-Docs.dll": "sha256-A8+lTAsuQrLEplz+6Px6cNx\/953CR5Sw\/\/zIb45vN1M=",
+      "BlazorStrap.V4.dll": "sha256-MIFODBlTGw2hj9hOh5BYFRVPdBZiHuz4QL+3hfUEdqM=",
+      "BlazorStrap.V5.dll": "sha256-fJn+UzbbmnAbI3RTVRApZHhktTShHDVEyNQvyHKkfXE=",
+      "BlazorStrap.WASM.dll": "sha256-9F+Ge28VGQygh2Sf8hqiBTumUZgkctr\/nmyyaRlTURs=",
+      "BlazorStrap-Docs.dll": "sha256-\/ZxCV4shw6brEkkbthCkSxaQoA4q7sm1W\/9rG1dfJGo=",
       "ColorCode.dll": "sha256-hF07ps23in9mbwaN4uSoZklQVfyJIw2Ep4R448bfkOk=",
       "FluentValidation.dll": "sha256-NflrIQKcfYxeVjrVYw+AP1+xnZJp67Wq9L5Vsd5Cr\/8=",
       "Markdig.dll": "sha256-9\/ICq2gSL+hjhMdZXNoIRs8wyZFtZpr3yFSW+RQVdoQ=",

diff --git a/docs/VNext/_framework/blazor.boot.json.br b/docs/VNext/_framework/blazor.boot.json.br
diff --git a/docs/VNext/_framework/blazor.boot.json.gz b/docs/VNext/_framework/blazor.boot.json.gz
diff --git a/src/BlazorStrap/Shared/Components/Common/BSDropdownBase.cs b/src/BlazorStrap/Shared/Components/Common/BSDropdownBase.cs
@@ -92,7 +92,7 @@ public abstract class BSDropdownBase : BlazorStrapBase, IAsyncDisposable
         [CascadingParameter] public BSDropdownBase? Parent { get; set; }
         public bool Active { get; private set; }
         internal int ChildCount { get; set; }
-        protected string DataRefId => (PopoverRef != null) ? PopoverRef.DataId : DataId;
+        public string DataRefId => (PopoverRef != null) ? PopoverRef.DataId : DataId;
         protected abstract string? LayoutClass { get; }
         protected abstract string? ClassBuilder { get; }
         protected abstract string? GroupClassBuilder { get; }

diff --git a/src/BlazorStrap/Shared/Components/Common/BSToggleBase.cs b/src/BlazorStrap/Shared/Components/Common/BSToggleBase.cs
@@ -57,8 +57,8 @@ protected string Target
         {
             get
             {
-                if (CollapseParent != null) return CollapseParent.DataId;
-                return DropDownParent != null ? DropDownParent.DataId : "";
+                if(DropDownParent != null) return DropDownParent.DataRefId;
+                return (CollapseParent != null) ? CollapseParent.DataId : "";
             }
         }
 

diff --git a/src/BlazorStrap/wwwroot/blazorstrapinterop.js b/src/BlazorStrap/wwwroot/blazorstrapinterop.js
@@ -727,7 +727,6 @@ function setupDocumentEvents(dotnet) {
                 .filter(element => element.classList.contains('show'))
                 .map(element => element);
             var canInvoke = true;
-
             relatedIds = [];
             if (relatedShown.length > 0) {
                 relatedShown.forEach(x => {