WIP

emberjs · Sep 19, 2019 · 68a011f · 68a011f
1 parent 047e1eb
commit 68a011f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 15 deletions.
diff --git a/app/helpers/do-if.js b/app/helpers/do-if.js
diff --git a/app/templates/components/deprecation-item.hbs b/app/templates/components/deprecation-item.hbs
@@ -3,11 +3,10 @@
     <div class="flex items-center">
       <div
         class="flex items-center flex-grow py-2"
-        {{on "click" disclosure.toggle}}
       >
         {{#if @model.hasSourceMap}}
           <div class="flex-shrink-0 w-3">
-            <Ui::DisclosureTriangle @expanded={{disclosure.isExpanded}} />
+            <disclosure.triangleIcon />
           </div>
         {{/if}}
 

diff --git a/app/templates/components/render-item.hbs b/app/templates/components/render-item.hbs
@@ -9,7 +9,7 @@
       style=this.nameStyle
     }}
       {{#if this.hasChildren}}
-        <Ui::DisclosureTriangle @expanded={{disclosure.isExpanded}} />
+        <disclosure.triangleIcon />
       {{/if}}
 
       <span title={{@model.name}}>

diff --git a/lib/ui/app/templates/components/ui/disclosure-triangle.hbs b/lib/ui/app/templates/components/ui/disclosure-triangle.hbs
@@ -1,7 +1,16 @@
-<button
-  class="disclosure-triangle {{if @expanded "expanded" "collapsed"}}"
-  {{on "click" (do-if @toggle @toggle)}}
-  ...attributes
->
-  {{svg-jar "disclosure-triangle" width="9px" height="9px"}}
-</button>
+{{#if @toggle}}
+  <button
+    class="disclosure-triangle {{if @expanded "expanded" "collapsed"}}"
+    {{on "click" @toggle}}
+    ...attributes
+  >
+    {{svg-jar "disclosure-triangle" width="9px" height="9px"}}
+  </button>
+{{else}}
+  <span
+    class="disclosure-triangle {{if @expanded "expanded" "collapsed"}}"
+    ...attributes
+  >
+    {{svg-jar "disclosure-triangle" width="9px" height="9px"}}
+  </span>
+{{/if}}
diff --git a/lib/ui/app/templates/components/ui/disclosure.hbs b/lib/ui/app/templates/components/ui/disclosure.hbs
@@ -1,4 +1,6 @@
 {{yield (hash
   isExpanded=this.isExpanded
   toggle=this.toggle
+  triangleIcon=(component "ui/disclosure-triangle" expanded=this.isExpanded)
+  triangleButton=(component "ui/disclosure-triangle" expanded=this.isExpanded toggle=this.toggle)
 )}}