merged new animation loading code

ilios · Jan 16, 2025 · bf6e1ba · bf6e1ba
1 parent fd403b8
commit bf6e1ba
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 24 deletions.
diff --git a/ember-simple-charts/src/components/simple-chart-donut.js b/ember-simple-charts/src/components/simple-chart-donut.js
@@ -19,6 +19,10 @@ export default class SimpleChartDonut extends Component {
   }
 
   get isLoading() {
+    if (this.args.isIcon) {
+      return false;
+    }
+
     return !this.loadingPromise || this.loadingData.isPending;
   }
 
@@ -80,19 +84,19 @@ export default class SimpleChartDonut extends Component {
         .attr('stroke', '#FFFFFF')
         .attr('fill', (d) => color(d.data.data));
 
-      this.loadingPromise = chart
-        .selectAll('path.slicepath')
-        .transition()
-        .ease(easeLinear)
-        .duration(500)
-        .attrTween('d', (b) => {
-          b.innerRadius = 0;
-          const i = interpolate({ startAngle: 0, endAngle: 0 }, b);
-          return (p) => createArc(i(p));
-        })
-        .end();
-
       if (!isIcon) {
+        this.loadingPromise = chart
+          .selectAll('path.slicepath')
+          .transition()
+          .ease(easeLinear)
+          .duration(500)
+          .attrTween('d', (b) => {
+            b.innerRadius = 0;
+            const i = interpolate({ startAngle: 0, endAngle: 0 }, b);
+            return (p) => createArc(i(p));
+          })
+          .end();
+
         const text = chart
           .selectAll('.slice')
           .append('text')

diff --git a/ember-simple-charts/src/components/simple-chart-pie.js b/ember-simple-charts/src/components/simple-chart-pie.js
@@ -19,6 +19,10 @@ export default class SimpleChartPie extends Component {
   }
 
   get isLoading() {
+    if (this.args.isIcon) {
+      return false;
+    }
+
     return !this.loadingPromise || this.loadingData.isPending;
   }
 
@@ -77,19 +81,19 @@ export default class SimpleChartPie extends Component {
         .attr('stroke', '#FFFFFF')
         .attr('fill', (d) => color(d.data.data));
 
-      this.loadingPromise = chart
-        .selectAll('path.slicepath')
-        .transition()
-        .ease(easeLinear)
-        .duration(500)
-        .attrTween('d', (b) => {
-          b.innerRadius = 0;
-          const i = interpolate({ startAngle: 0, endAngle: 0 }, b);
-          return (p) => createArc(i(p));
-        })
-        .end();
-
       if (!isIcon) {
+        this.loadingPromise = chart
+          .selectAll('path.slicepath')
+          .transition()
+          .ease(easeLinear)
+          .duration(500)
+          .attrTween('d', (b) => {
+            b.innerRadius = 0;
+            const i = interpolate({ startAngle: 0, endAngle: 0 }, b);
+            return (p) => createArc(i(p));
+          })
+          .end();
+
         const text = chart
           .selectAll('.slice')
           .append('text')