pace-chart-lib 1.0.49 → 1.0.51

package/dist/pace-chart-lib.es.js

@@ -559,6 +559,27 @@ function keyof(value2) {
 function identity$8(x2) {
   return x2;
 }
+function group(values, ...keys) {
+  return nest(values, identity$8, identity$8, keys);
+}
+function nest(values, map2, reduce, keys) {
+  return (function regroup(values2, i) {
+    if (i >= keys.length) return reduce(values2);
+    const groups = new InternMap();
+    const keyof2 = keys[i++];
+    let index2 = -1;
+    for (const value2 of values2) {
+      const key = keyof2(value2, ++index2, values2);
+      const group2 = groups.get(key);
+      if (group2) group2.push(value2);
+      else groups.set(key, [value2]);
+    }
+    for (const [key, values3] of groups) {
+      groups.set(key, regroup(values3, i));
+    }
+    return map2(groups);
+  })(values, 0);
+}
 function compareDefined(compare = ascending$3) {
   if (compare === ascending$3) return ascendingDefined;
   if (typeof compare !== "function") throw new TypeError("compare is not a function");
@@ -1057,8 +1078,8 @@ function selector$2(selector2) {
 function selection_select$2(select2) {
   if (typeof select2 !== "function") select2 = selector$2(select2);
   for (var groups = this._groups, m = groups.length, subgroups = new Array(m), j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, subgroup = subgroups[j] = new Array(n), node, subnode, i = 0; i < n; ++i) {
-      if ((node = group[i]) && (subnode = select2.call(node, node.__data__, i, group))) {
+    for (var group2 = groups[j], n = group2.length, subgroup = subgroups[j] = new Array(n), node, subnode, i = 0; i < n; ++i) {
+      if ((node = group2[i]) && (subnode = select2.call(node, node.__data__, i, group2))) {
         if ("__data__" in node) subnode.__data__ = node.__data__;
         subgroup[i] = subnode;
       }
@@ -1086,9 +1107,9 @@ function selection_selectAll$2(select2) {
   if (typeof select2 === "function") select2 = arrayAll(select2);
   else select2 = selectorAll$2(select2);
   for (var groups = this._groups, m = groups.length, subgroups = [], parents = [], j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, node, i = 0; i < n; ++i) {
-      if (node = group[i]) {
-        subgroups.push(select2.call(node, node.__data__, i, group));
+    for (var group2 = groups[j], n = group2.length, node, i = 0; i < n; ++i) {
+      if (node = group2[i]) {
+        subgroups.push(select2.call(node, node.__data__, i, group2));
         parents.push(node);
       }
     }
@@ -1132,8 +1153,8 @@ function selection_selectChildren(match) {
 function selection_filter$2(match) {
   if (typeof match !== "function") match = matcher$2(match);
   for (var groups = this._groups, m = groups.length, subgroups = new Array(m), j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, subgroup = subgroups[j] = [], node, i = 0; i < n; ++i) {
-      if ((node = group[i]) && match.call(node, node.__data__, i, group)) {
+    for (var group2 = groups[j], n = group2.length, subgroup = subgroups[j] = [], node, i = 0; i < n; ++i) {
+      if ((node = group2[i]) && match.call(node, node.__data__, i, group2)) {
         subgroup.push(node);
       }
     }
@@ -1173,10 +1194,10 @@ function constant$b(x2) {
     return x2;
   };
 }
-function bindIndex$2(parent, group, enter, update, exit, data) {
-  var i = 0, node, groupLength = group.length, dataLength = data.length;
+function bindIndex$2(parent, group2, enter, update, exit, data) {
+  var i = 0, node, groupLength = group2.length, dataLength = data.length;
   for (; i < dataLength; ++i) {
-    if (node = group[i]) {
+    if (node = group2[i]) {
       node.__data__ = data[i];
       update[i] = node;
     } else {
@@ -1184,16 +1205,16 @@ function bindIndex$2(parent, group, enter, update, exit, data) {
     }
   }
   for (; i < groupLength; ++i) {
-    if (node = group[i]) {
+    if (node = group2[i]) {
       exit[i] = node;
     }
   }
 }
-function bindKey$2(parent, group, enter, update, exit, data, key) {
-  var i, node, nodeByKeyValue = /* @__PURE__ */ new Map(), groupLength = group.length, dataLength = data.length, keyValues = new Array(groupLength), keyValue;
+function bindKey$2(parent, group2, enter, update, exit, data, key) {
+  var i, node, nodeByKeyValue = /* @__PURE__ */ new Map(), groupLength = group2.length, dataLength = data.length, keyValues = new Array(groupLength), keyValue;
   for (i = 0; i < groupLength; ++i) {
-    if (node = group[i]) {
-      keyValues[i] = keyValue = key.call(node, node.__data__, i, group) + "";
+    if (node = group2[i]) {
+      keyValues[i] = keyValue = key.call(node, node.__data__, i, group2) + "";
       if (nodeByKeyValue.has(keyValue)) {
         exit[i] = node;
       } else {
@@ -1212,7 +1233,7 @@ function bindKey$2(parent, group, enter, update, exit, data, key) {
     }
   }
   for (i = 0; i < groupLength; ++i) {
-    if ((node = group[i]) && nodeByKeyValue.get(keyValues[i]) === node) {
+    if ((node = group2[i]) && nodeByKeyValue.get(keyValues[i]) === node) {
       exit[i] = node;
     }
   }
@@ -1225,8 +1246,8 @@ function selection_data$2(value2, key) {
   var bind = key ? bindKey$2 : bindIndex$2, parents = this._parents, groups = this._groups;
   if (typeof value2 !== "function") value2 = constant$b(value2);
   for (var m = groups.length, update = new Array(m), enter = new Array(m), exit = new Array(m), j = 0; j < m; ++j) {
-    var parent = parents[j], group = groups[j], groupLength = group.length, data = arraylike(value2.call(parent, parent && parent.__data__, j, parents)), dataLength = data.length, enterGroup = enter[j] = new Array(dataLength), updateGroup = update[j] = new Array(dataLength), exitGroup = exit[j] = new Array(groupLength);
-    bind(parent, group, enterGroup, updateGroup, exitGroup, data, key);
+    var parent = parents[j], group2 = groups[j], groupLength = group2.length, data = arraylike(value2.call(parent, parent && parent.__data__, j, parents)), dataLength = data.length, enterGroup = enter[j] = new Array(dataLength), updateGroup = update[j] = new Array(dataLength), exitGroup = exit[j] = new Array(groupLength);
+    bind(parent, group2, enterGroup, updateGroup, exitGroup, data, key);
     for (var i0 = 0, i1 = 0, previous, next; i0 < dataLength; ++i0) {
       if (previous = enterGroup[i0]) {
         if (i0 >= i1) i1 = i0 + 1;
@@ -1278,8 +1299,8 @@ function selection_merge$2(context) {
 }
 function selection_order$2() {
   for (var groups = this._groups, j = -1, m = groups.length; ++j < m; ) {
-    for (var group = groups[j], i = group.length - 1, next = group[i], node; --i >= 0; ) {
-      if (node = group[i]) {
+    for (var group2 = groups[j], i = group2.length - 1, next = group2[i], node; --i >= 0; ) {
+      if (node = group2[i]) {
         if (next && node.compareDocumentPosition(next) ^ 4) next.parentNode.insertBefore(node, next);
         next = node;
       }
@@ -1293,8 +1314,8 @@ function selection_sort$2(compare) {
     return a2 && b ? compare(a2.__data__, b.__data__) : !a2 - !b;
   }
   for (var groups = this._groups, m = groups.length, sortgroups = new Array(m), j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, sortgroup = sortgroups[j] = new Array(n), node, i = 0; i < n; ++i) {
-      if (node = group[i]) {
+    for (var group2 = groups[j], n = group2.length, sortgroup = sortgroups[j] = new Array(n), node, i = 0; i < n; ++i) {
+      if (node = group2[i]) {
         sortgroup[i] = node;
       }
     }
@@ -1316,8 +1337,8 @@ function selection_nodes$2() {
 }
 function selection_node$2() {
   for (var groups = this._groups, j = 0, m = groups.length; j < m; ++j) {
-    for (var group = groups[j], i = 0, n = group.length; i < n; ++i) {
-      var node = group[i];
+    for (var group2 = groups[j], i = 0, n = group2.length; i < n; ++i) {
+      var node = group2[i];
       if (node) return node;
     }
   }
@@ -1333,8 +1354,8 @@ function selection_empty$2() {
 }
 function selection_each$2(callback) {
   for (var groups = this._groups, j = 0, m = groups.length; j < m; ++j) {
-    for (var group = groups[j], i = 0, n = group.length, node; i < n; ++i) {
-      if (node = group[i]) callback.call(node, node.__data__, i, group);
+    for (var group2 = groups[j], i = 0, n = group2.length, node; i < n; ++i) {
+      if (node = group2[i]) callback.call(node, node.__data__, i, group2);
     }
   }
   return this;
@@ -1657,8 +1678,8 @@ function selection_dispatch$2(type, params) {
 }
 function* selection_iterator() {
   for (var groups = this._groups, j = 0, m = groups.length; j < m; ++j) {
-    for (var group = groups[j], i = 0, n = group.length, node; i < n; ++i) {
-      if (node = group[i]) yield node;
+    for (var group2 = groups[j], i = 0, n = group2.length, node; i < n; ++i) {
+      if (node = group2[i]) yield node;
     }
   }
 }
@@ -2751,7 +2772,7 @@ var STARTED$1 = 3;
 var RUNNING$1 = 4;
 var ENDING$1 = 5;
 var ENDED$1 = 6;
-function schedule$1(node, name, id2, index2, group, timing) {
+function schedule$1(node, name, id2, index2, group2, timing) {
   var schedules = node.__transition;
   if (!schedules) node.__transition = {};
   else if (id2 in schedules) return;
@@ -2759,7 +2780,7 @@ function schedule$1(node, name, id2, index2, group, timing) {
     name,
     index: index2,
     // For context during callback.
-    group,
+    group: group2,
     // For context during callback.
     on: emptyOn$1,
     tween: emptyTween$1,
@@ -3074,8 +3095,8 @@ function transition_easeVarying(value2) {
 function transition_filter$1(match) {
   if (typeof match !== "function") match = matcher$2(match);
   for (var groups = this._groups, m = groups.length, subgroups = new Array(m), j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, subgroup = subgroups[j] = [], node, i = 0; i < n; ++i) {
-      if ((node = group[i]) && match.call(node, node.__data__, i, group)) {
+    for (var group2 = groups[j], n = group2.length, subgroup = subgroups[j] = [], node, i = 0; i < n; ++i) {
+      if ((node = group2[i]) && match.call(node, node.__data__, i, group2)) {
         subgroup.push(node);
       }
     }
@@ -3129,8 +3150,8 @@ function transition_select$1(select2) {
   var name = this._name, id2 = this._id;
   if (typeof select2 !== "function") select2 = selector$2(select2);
   for (var groups = this._groups, m = groups.length, subgroups = new Array(m), j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, subgroup = subgroups[j] = new Array(n), node, subnode, i = 0; i < n; ++i) {
-      if ((node = group[i]) && (subnode = select2.call(node, node.__data__, i, group))) {
+    for (var group2 = groups[j], n = group2.length, subgroup = subgroups[j] = new Array(n), node, subnode, i = 0; i < n; ++i) {
+      if ((node = group2[i]) && (subnode = select2.call(node, node.__data__, i, group2))) {
         if ("__data__" in node) subnode.__data__ = node.__data__;
         subgroup[i] = subnode;
         schedule$1(subgroup[i], name, id2, i, subgroup, get$5(node, id2));
@@ -3143,9 +3164,9 @@ function transition_selectAll$1(select2) {
   var name = this._name, id2 = this._id;
   if (typeof select2 !== "function") select2 = selectorAll$2(select2);
   for (var groups = this._groups, m = groups.length, subgroups = [], parents = [], j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, node, i = 0; i < n; ++i) {
-      if (node = group[i]) {
-        for (var children2 = select2.call(node, node.__data__, i, group), child, inherit2 = get$5(node, id2), k2 = 0, l = children2.length; k2 < l; ++k2) {
+    for (var group2 = groups[j], n = group2.length, node, i = 0; i < n; ++i) {
+      if (node = group2[i]) {
+        for (var children2 = select2.call(node, node.__data__, i, group2), child, inherit2 = get$5(node, id2), k2 = 0, l = children2.length; k2 < l; ++k2) {
           if (child = children2[k2]) {
             schedule$1(child, name, id2, k2, children2, inherit2);
           }
@@ -3261,10 +3282,10 @@ function transition_textTween$1(value2) {
 function transition_transition$1() {
   var name = this._name, id0 = this._id, id1 = newId$1();
   for (var groups = this._groups, m = groups.length, j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, node, i = 0; i < n; ++i) {
-      if (node = group[i]) {
+    for (var group2 = groups[j], n = group2.length, node, i = 0; i < n; ++i) {
+      if (node = group2[i]) {
         var inherit2 = get$5(node, id0);
-        schedule$1(node, name, id1, i, group, {
+        schedule$1(node, name, id1, i, group2, {
           time: inherit2.time + inherit2.delay + inherit2.duration,
           delay: 0,
           duration: inherit2.duration,
@@ -3407,9 +3428,9 @@ function selection_transition$1(name) {
     id2 = newId$1(), (timing = defaultTiming$1).time = now$1(), name = name == null ? null : name + "";
   }
   for (var groups = this._groups, m = groups.length, j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, node, i = 0; i < n; ++i) {
-      if (node = group[i]) {
-        schedule$1(node, name, id2, i, group, timing || inherit$1(node, id2));
+    for (var group2 = groups[j], n = group2.length, node, i = 0; i < n; ++i) {
+      if (node = group2[i]) {
+        schedule$1(node, name, id2, i, group2, timing || inherit$1(node, id2));
       }
     }
   }
@@ -3619,7 +3640,7 @@ function identity$5(x2) {
 }
 var map = Array.prototype.map, prefixes = ["y", "z", "a", "f", "p", "n", "µ", "m", "", "k", "M", "G", "T", "P", "E", "Z", "Y"];
 function formatLocale(locale2) {
-  var group = locale2.grouping === void 0 || locale2.thousands === void 0 ? identity$5 : formatGroup(map.call(locale2.grouping, Number), locale2.thousands + ""), currencyPrefix = locale2.currency === void 0 ? "" : locale2.currency[0] + "", currencySuffix = locale2.currency === void 0 ? "" : locale2.currency[1] + "", decimal = locale2.decimal === void 0 ? "." : locale2.decimal + "", numerals = locale2.numerals === void 0 ? identity$5 : formatNumerals(map.call(locale2.numerals, String)), percent = locale2.percent === void 0 ? "%" : locale2.percent + "", minus = locale2.minus === void 0 ? "−" : locale2.minus + "", nan = locale2.nan === void 0 ? "NaN" : locale2.nan + "";
+  var group2 = locale2.grouping === void 0 || locale2.thousands === void 0 ? identity$5 : formatGroup(map.call(locale2.grouping, Number), locale2.thousands + ""), currencyPrefix = locale2.currency === void 0 ? "" : locale2.currency[0] + "", currencySuffix = locale2.currency === void 0 ? "" : locale2.currency[1] + "", decimal = locale2.decimal === void 0 ? "." : locale2.decimal + "", numerals = locale2.numerals === void 0 ? identity$5 : formatNumerals(map.call(locale2.numerals, String)), percent = locale2.percent === void 0 ? "%" : locale2.percent + "", minus = locale2.minus === void 0 ? "−" : locale2.minus + "", nan = locale2.nan === void 0 ? "NaN" : locale2.nan + "";
   function newFormat(specifier) {
     specifier = formatSpecifier(specifier);
     var fill = specifier.fill, align = specifier.align, sign2 = specifier.sign, symbol = specifier.symbol, zero2 = specifier.zero, width = specifier.width, comma = specifier.comma, precision = specifier.precision, trim = specifier.trim, type = specifier.type;
@@ -3653,9 +3674,9 @@ function formatLocale(locale2) {
           }
         }
       }
-      if (comma && !zero2) value2 = group(value2, Infinity);
+      if (comma && !zero2) value2 = group2(value2, Infinity);
       var length = valuePrefix.length + value2.length + valueSuffix.length, padding = length < width ? new Array(width - length + 1).join(fill) : "";
-      if (comma && zero2) value2 = group(padding + value2, padding.length ? width - valueSuffix.length : Infinity), padding = "";
+      if (comma && zero2) value2 = group2(padding + value2, padding.length ? width - valueSuffix.length : Infinity), padding = "";
       switch (align) {
         case "<":
           value2 = valuePrefix + value2 + valueSuffix + padding;
@@ -7331,8 +7352,8 @@ function selector$1(selector2) {
 function selection_select$1(select2) {
   if (typeof select2 !== "function") select2 = selector$1(select2);
   for (var groups = this._groups, m = groups.length, subgroups = new Array(m), j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, subgroup = subgroups[j] = new Array(n), node, subnode, i = 0; i < n; ++i) {
-      if ((node = group[i]) && (subnode = select2.call(node, node.__data__, i, group))) {
+    for (var group2 = groups[j], n = group2.length, subgroup = subgroups[j] = new Array(n), node, subnode, i = 0; i < n; ++i) {
+      if ((node = group2[i]) && (subnode = select2.call(node, node.__data__, i, group2))) {
         if ("__data__" in node) subnode.__data__ = node.__data__;
         subgroup[i] = subnode;
       }
@@ -7351,9 +7372,9 @@ function selectorAll$1(selector2) {
 function selection_selectAll$1(select2) {
   if (typeof select2 !== "function") select2 = selectorAll$1(select2);
   for (var groups = this._groups, m = groups.length, subgroups = [], parents = [], j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, node, i = 0; i < n; ++i) {
-      if (node = group[i]) {
-        subgroups.push(select2.call(node, node.__data__, i, group));
+    for (var group2 = groups[j], n = group2.length, node, i = 0; i < n; ++i) {
+      if (node = group2[i]) {
+        subgroups.push(select2.call(node, node.__data__, i, group2));
         parents.push(node);
       }
     }
@@ -7368,8 +7389,8 @@ function matcher$1(selector2) {
 function selection_filter$1(match) {
   if (typeof match !== "function") match = matcher$1(match);
   for (var groups = this._groups, m = groups.length, subgroups = new Array(m), j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, subgroup = subgroups[j] = [], node, i = 0; i < n; ++i) {
-      if ((node = group[i]) && match.call(node, node.__data__, i, group)) {
+    for (var group2 = groups[j], n = group2.length, subgroup = subgroups[j] = [], node, i = 0; i < n; ++i) {
+      if ((node = group2[i]) && match.call(node, node.__data__, i, group2)) {
         subgroup.push(node);
       }
     }
@@ -7410,10 +7431,10 @@ function constant$5(x2) {
   };
 }
 var keyPrefix$1 = "$";
-function bindIndex$1(parent, group, enter, update, exit, data) {
-  var i = 0, node, groupLength = group.length, dataLength = data.length;
+function bindIndex$1(parent, group2, enter, update, exit, data) {
+  var i = 0, node, groupLength = group2.length, dataLength = data.length;
   for (; i < dataLength; ++i) {
-    if (node = group[i]) {
+    if (node = group2[i]) {
       node.__data__ = data[i];
       update[i] = node;
     } else {
@@ -7421,16 +7442,16 @@ function bindIndex$1(parent, group, enter, update, exit, data) {
     }
   }
   for (; i < groupLength; ++i) {
-    if (node = group[i]) {
+    if (node = group2[i]) {
       exit[i] = node;
     }
   }
 }
-function bindKey$1(parent, group, enter, update, exit, data, key) {
-  var i, node, nodeByKeyValue = {}, groupLength = group.length, dataLength = data.length, keyValues = new Array(groupLength), keyValue;
+function bindKey$1(parent, group2, enter, update, exit, data, key) {
+  var i, node, nodeByKeyValue = {}, groupLength = group2.length, dataLength = data.length, keyValues = new Array(groupLength), keyValue;
   for (i = 0; i < groupLength; ++i) {
-    if (node = group[i]) {
-      keyValues[i] = keyValue = keyPrefix$1 + key.call(node, node.__data__, i, group);
+    if (node = group2[i]) {
+      keyValues[i] = keyValue = keyPrefix$1 + key.call(node, node.__data__, i, group2);
       if (keyValue in nodeByKeyValue) {
         exit[i] = node;
       } else {
@@ -7449,7 +7470,7 @@ function bindKey$1(parent, group, enter, update, exit, data, key) {
     }
   }
   for (i = 0; i < groupLength; ++i) {
-    if ((node = group[i]) && nodeByKeyValue[keyValues[i]] === node) {
+    if ((node = group2[i]) && nodeByKeyValue[keyValues[i]] === node) {
       exit[i] = node;
     }
   }
@@ -7465,8 +7486,8 @@ function selection_data$1(value2, key) {
   var bind = key ? bindKey$1 : bindIndex$1, parents = this._parents, groups = this._groups;
   if (typeof value2 !== "function") value2 = constant$5(value2);
   for (var m = groups.length, update = new Array(m), enter = new Array(m), exit = new Array(m), j = 0; j < m; ++j) {
-    var parent = parents[j], group = groups[j], groupLength = group.length, data = value2.call(parent, parent && parent.__data__, j, parents), dataLength = data.length, enterGroup = enter[j] = new Array(dataLength), updateGroup = update[j] = new Array(dataLength), exitGroup = exit[j] = new Array(groupLength);
-    bind(parent, group, enterGroup, updateGroup, exitGroup, data, key);
+    var parent = parents[j], group2 = groups[j], groupLength = group2.length, data = value2.call(parent, parent && parent.__data__, j, parents), dataLength = data.length, enterGroup = enter[j] = new Array(dataLength), updateGroup = update[j] = new Array(dataLength), exitGroup = exit[j] = new Array(groupLength);
+    bind(parent, group2, enterGroup, updateGroup, exitGroup, data, key);
     for (var i0 = 0, i1 = 0, previous, next; i0 < dataLength; ++i0) {
       if (previous = enterGroup[i0]) {
         if (i0 >= i1) i1 = i0 + 1;
@@ -7506,8 +7527,8 @@ function selection_merge$1(selection2) {
 }
 function selection_order$1() {
   for (var groups = this._groups, j = -1, m = groups.length; ++j < m; ) {
-    for (var group = groups[j], i = group.length - 1, next = group[i], node; --i >= 0; ) {
-      if (node = group[i]) {
+    for (var group2 = groups[j], i = group2.length - 1, next = group2[i], node; --i >= 0; ) {
+      if (node = group2[i]) {
         if (next && node.compareDocumentPosition(next) ^ 4) next.parentNode.insertBefore(node, next);
         next = node;
       }
@@ -7521,8 +7542,8 @@ function selection_sort$1(compare) {
     return a2 && b ? compare(a2.__data__, b.__data__) : !a2 - !b;
   }
   for (var groups = this._groups, m = groups.length, sortgroups = new Array(m), j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, sortgroup = sortgroups[j] = new Array(n), node, i = 0; i < n; ++i) {
-      if (node = group[i]) {
+    for (var group2 = groups[j], n = group2.length, sortgroup = sortgroups[j] = new Array(n), node, i = 0; i < n; ++i) {
+      if (node = group2[i]) {
         sortgroup[i] = node;
       }
     }
@@ -7548,8 +7569,8 @@ function selection_nodes$1() {
 }
 function selection_node$1() {
   for (var groups = this._groups, j = 0, m = groups.length; j < m; ++j) {
-    for (var group = groups[j], i = 0, n = group.length; i < n; ++i) {
-      var node = group[i];
+    for (var group2 = groups[j], i = 0, n = group2.length; i < n; ++i) {
+      var node = group2[i];
       if (node) return node;
     }
   }
@@ -7567,8 +7588,8 @@ function selection_empty$1() {
 }
 function selection_each$1(callback) {
   for (var groups = this._groups, j = 0, m = groups.length; j < m; ++j) {
-    for (var group = groups[j], i = 0, n = group.length, node; i < n; ++i) {
-      if (node = group[i]) callback.call(node, node.__data__, i, group);
+    for (var group2 = groups[j], i = 0, n = group2.length, node; i < n; ++i) {
+      if (node = group2[i]) callback.call(node, node.__data__, i, group2);
     }
   }
   return this;
@@ -7810,8 +7831,8 @@ if (typeof document !== "undefined") {
     filterEvents$1 = { mouseenter: "mouseover", mouseleave: "mouseout" };
   }
 }
-function filterContextListener$1(listener, index2, group) {
-  listener = contextListener$1(listener, index2, group);
+function filterContextListener$1(listener, index2, group2) {
+  listener = contextListener$1(listener, index2, group2);
   return function(event2) {
     var related = event2.relatedTarget;
     if (!related || related !== this && !(related.compareDocumentPosition(this) & 8)) {
@@ -7819,12 +7840,12 @@ function filterContextListener$1(listener, index2, group) {
     }
   };
 }
-function contextListener$1(listener, index2, group) {
+function contextListener$1(listener, index2, group2) {
   return function(event1) {
     var event0 = event;
     event = event1;
     try {
-      listener.call(this, this.__data__, index2, group);
+      listener.call(this, this.__data__, index2, group2);
     } finally {
       event = event0;
     }
@@ -7854,8 +7875,8 @@ function onRemove$1(typename) {
 }
 function onAdd$1(typename, value2, capture) {
   var wrap3 = filterEvents$1.hasOwnProperty(typename.type) ? filterContextListener$1 : contextListener$1;
-  return function(d, i, group) {
-    var on = this.__on, o, listener = wrap3(value2, i, group);
+  return function(d, i, group2) {
+    var on = this.__on, o, listener = wrap3(value2, i, group2);
     if (on) for (var j = 0, m = on.length; j < m; ++j) {
       if ((o = on[j]).type === typename.type && o.name === typename.name) {
         this.removeEventListener(o.type, o.listener, o.capture);
@@ -9471,8 +9492,8 @@ var circleHandles = function circleHandles2(_ref2) {
   return h;
 };
 var addHandles = function addHandles2(_ref5) {
-  var group = _ref5.group, handles = _ref5.handles, _ref5$r = _ref5.r, r = _ref5$r === void 0 ? 10 : _ref5$r;
-  var h = group.selectAll("circle.handle").data(handles);
+  var group2 = _ref5.group, handles = _ref5.handles, _ref5$r = _ref5.r, r = _ref5$r === void 0 ? 10 : _ref5$r;
+  var h = group2.selectAll("circle.handle").data(handles);
   h.enter().append("circle").attr("class", "handle").attr("fill", "grey").attr("fill-opacity", 0.1).attr("cursor", "move").attr("stroke-dasharray", 5).attr("stroke", "grey").call(drag().container(select$1("g.annotations").node()).on("start", function(d) {
     return d.start && d.start(d);
   }).on("drag", function(d) {
@@ -9480,7 +9501,7 @@ var addHandles = function addHandles2(_ref5) {
   }).on("end", function(d) {
     return d.end && d.end(d);
   }));
-  group.selectAll("circle.handle").attr("cx", function(d) {
+  group2.selectAll("circle.handle").attr("cx", function(d) {
     return d.x;
   }).attr("cy", function(d) {
     return d.y;
@@ -10496,9 +10517,9 @@ var d3XYThreshold = customType(ThresholdMap, {
   subject: { type: "threshold" }
 });
 var newWithClass = function newWithClass2(a2, d, type, className, classID) {
-  var group = a2.selectAll(type + "." + (classID || className)).data(d);
-  group.enter().append(type).merge(group).attr("class", className);
-  group.exit().remove();
+  var group2 = a2.selectAll(type + "." + (classID || className)).data(d);
+  group2.enter().append(type).merge(group2).attr("class", className);
+  group2.exit().remove();
   return a2;
 };
 var addHandlers = function addHandlers2(dispatcher, annotation2, _ref3) {
@@ -10571,9 +10592,9 @@ function annotation() {
     });
     var annotationG = selection2.selectAll("g").data([collection]);
     annotationG.enter().append("g").attr("class", "annotations");
-    var group = selection2.select("g.annotations");
-    newWithClass(group, collection.annotations, "g", "annotation");
-    var annotation4 = group.selectAll("g.annotation");
+    var group2 = selection2.select("g.annotations");
+    newWithClass(group2, collection.annotations, "g", "annotation");
+    var annotation4 = group2.selectAll("g.annotation");
     annotation4.each(function(d) {
       var a2 = select$1(this);
       a2.attr("class", "annotation");
@@ -11577,7 +11598,7 @@ var chartTypes = /* @__PURE__ */ ((chartTypes2) => {
   chartTypes2["CombinationArea"] = "CombinationArea";
   chartTypes2["CombinationStackArea"] = "CombinationStackArea";
   chartTypes2["TornadoDefaultEntry"] = "defaultEntry";
-  chartTypes2["ClevelandDotPlot"] = "ClevelandDotPlot";
+  chartTypes2["DotPlot"] = "DotPlot";
   return chartTypes2;
 })(chartTypes || {});
 const connecterCurve = {
@@ -12374,10 +12395,10 @@ function initChartArea$1(svg, margin) {
     throw error;
   }
 }
-function initPlotArea(g, formatOptions, dataTableHeight, innerWidth2, innerHeight2, chartType) {
+function initPlotArea(g, formatOptions, dataTableHeight, innerWidth2, innerHeight2, chartType, chartId) {
   try {
-    let uniqueID = crypto.randomUUID().toUpperCase();
-    g.append("defs").append("clipPath").attr("id", uniqueID).append("rect").attr("width", innerWidth2).attr(
+    let uniqueID = chartId ?? crypto.randomUUID().toUpperCase();
+    g.append("defs").append("clipPath").attr("id", uniqueID + "-clip").append("rect").attr("width", innerWidth2).attr(
       "height",
       dataTableHeight > 0 ? innerHeight2 - dataTableHeight : innerHeight2
     );
@@ -13374,7 +13395,8 @@ function commonAnnotations(chartData, xScale, yScaleLeft, yScaleRight, margin, d
           } else {
             if (barChart) {
               const legendUniqueId = d.legendUniqueId.includes("~$~") ? d.legendUniqueId.split("~$~")[0] : d.legendUniqueId;
-              return isTornadoChart ? xScaleForLegends(d.y) + xScaleForLegends.bandwidth() / 2 : xScaleForLegends ? xScale(d.y) + xScaleForLegends(legendUniqueId) - (columnWidth - xScaleForLegends.bandwidth()) / 2 - 5 : xScale(d.y) - 5;
+              const xScaleLegend = chartType !== chartTypes.DotPlot ? xScaleForLegends(legendUniqueId) : 0;
+              return isTornadoChart ? xScaleForLegends(d.y) + xScaleForLegends.bandwidth() / 2 : xScaleForLegends ? xScale(d.y) + xScaleLegend - (columnWidth - xScaleForLegends.bandwidth()) / 2 - 5 : xScale(d.y) - 5;
             } else
               return dataLabelsPosition(
                 d.y.measure,
@@ -15462,10 +15484,10 @@ const initYaxisBar = (formatOptions, gTag, xLabel, innerHeight2, innerWidth2, yA
     const isRotationZero = formatOptions.xAxisLabel.xAxisLabelRotation == 0;
     let yRect = gTag.append("rect").attr("id", "yAxisRect").attr(
       "transform",
-      chartType === chartTypes.TornadoChart ? `translate(${-xLabelMargin + 10},0)` : `translate(${xaxisLabelPosition === 0 ? -xLabelMargin - 5 : xaxisLabelPosition === 1 ? innerWidth2 : xScaleBottom(0) + (-xLabelMargin - 5)},0)`
+      chartType === chartTypes.TornadoChart ? `translate(${-xLabelMargin - 1},0)` : `translate(${xaxisLabelPosition === 0 ? -xLabelMargin - 5 : xaxisLabelPosition === 1 ? innerWidth2 : xScaleBottom(0) + (-xLabelMargin - 5)},0)`
     ).attr("height", innerHeight2).attr(
       "width",
-      chartType === chartTypes.TornadoChart ? xLabelMargin + 20 : xLabelMargin + 5
+      chartType === chartTypes.TornadoChart ? xLabelMargin : xLabelMargin + 5
     ).attr(
       "fill",
       formatOptions.xAxisLabel.xAxisLabelVisibility ? formatOptions.xAxisLabel.xAxisBackgroundColor ? formatOptions.xAxisLabel.xAxisBackgroundColor !== commonColors.white ? formatOptions.xAxisLabel.xAxisBackgroundColor : "none" : formatOptions.chartArea.chartAreaColor : formatOptions.chartArea.chartAreaColor
@@ -15730,7 +15752,7 @@ const horizontalScrollBar = (seriesData, height, width, svg, margin, innerWidth2
     );
     svg.on("wheel", (event2) => {
       event2.preventDefault();
-      const scrollDelta = Math.abs(event2.deltaX) > Math.abs(event2.deltaY) ? event2.deltaX : event2.deltaY;
+      const scrollDelta = isBarChart ? event2.deltaY : event2.deltaX;
       const step2 = scrollDelta > 0 ? 1 : -1;
       updateFromScrollPosition(step2, scrollMax, handleWidth, handle, true);
       if (isBarChart) {
@@ -16071,9 +16093,6 @@ function calculateMaxLegendWidth(list, formatOptions) {
 }
 function lineMarkers(lines, chartData, type, xScale, yScale, yScaleRight, tooltipHandle, formatOptions, chartJSON, secondaryCustomYaxisMaxValue, secondaryCustomYaxisMinValue, customYaxisMinValue, customYaxisMaxValue, isNormalizedChart) {
   try {
-    let Markershapes = function(Shape) {
-      return Shape == "Square" ? square : Shape == "Circle" ? circle : Shape == "Cross" ? cross : Shape == "Triangle" ? triangle : Shape == "Star" ? star : Shape == "Diamond" ? diamond : Shape == "Wye" ? wye : circle;
-    };
     let hideZeroValues = formatOptions.plotArea.hideZeroValues;
     formatOptions.plotArea.plotAreaHideLineAndMarkers === void 0 ? formatOptions.plotArea.plotAreaHideLineAndMarkers = true : null;
     chartData.forEach(
@@ -16091,8 +16110,8 @@ function lineMarkers(lines, chartData, type, xScale, yScale, yScaleRight, toolti
     let markerGroupsEnter = markerGroups.enter().append("g").attr("class", "parentGroup").attr("hoverId", (d) => (d.properties.alias || d.properties.name || "Legend").replace(/\s+/g, "-"));
     let mergedMarkerGroups = markerGroupsEnter.merge(markerGroups);
     mergedMarkerGroups.each(function(groupData) {
-      const group = select$2(this);
-      let markers = group.selectAll("path").data(groupData.data);
+      const group2 = select$2(this);
+      let markers = group2.selectAll("path").data(groupData.data);
       let markersEnter = markers.enter().append("path").attr("fill", (d) => d.markerColor);
       markersEnter.merge(markers).attr("d", (d) => {
         return Symbol$1().type(Markershapes(d.markerShape)).size(d.markerSize * 50)();
@@ -16167,6 +16186,9 @@ function lineMarkers(lines, chartData, type, xScale, yScale, yScaleRight, toolti
     logError$2(fileName$b, "lineMarkers", error);
   }
 }
+function Markershapes(Shape) {
+  return Shape == "Square" ? square : Shape == "Circle" ? circle : Shape == "Cross" ? cross : Shape == "Triangle" ? triangle : Shape == "Star" ? star : Shape == "Diamond" ? diamond : Shape == "Wye" ? wye : circle;
+}
 const checkVisibleConditions = (chartData, d, type, hideZeroValues, yScaleRight, customYaxisMinValue, customYaxisMaxValue) => {
   try {
     if (chartData[0].properties.axis && chartData[0].properties.axis === "Secondary") {
@@ -16385,8 +16407,8 @@ function getAutoNumberWithFormat(value2) {
 }
 function showTooltipOnMouseMove(elements, chartFormatOptions, event2, prop) {
   try {
-    const markerColor = prop.color ?? prop?.markerColor ?? "blue";
-    const markerShape = prop?.markerShape.toLowerCase() ?? "circle";
+    const markerColor = prop?.color ?? prop?.markerColor ?? "blue";
+    const markerShape = prop?.markerShape?.toLowerCase() ?? "circle";
     const isLightTheme = chartFormatOptions.toolTip.toolTipTheme === "Light";
     const bgColor = isLightTheme ? "rgba(255, 255, 255)" : "#272729ff";
     const textColor = isLightTheme ? "black" : commonColors.white;
@@ -17102,12 +17124,12 @@ function modifySeriesDataForTornadoChart(seriesData, data, isAdvanceAnalyticsCha
     };
     const measureMap = /* @__PURE__ */ new Map();
     data?.LegendList?.forEach((legend) => {
-      measureMap.set(splitLengend(legend?.name), legend);
+      measureMap.set(isAdvanceAnalyticsChart ? splitLengend(legend?.name) : legend.measureUniqueId, legend);
     });
     return seriesData.map((series) => {
       return {
         ...series,
-        properties: measureMap.get(isAdvanceAnalyticsChart ? splitLengend(series.legend) : series.properties.currentMeasure) ?? series.properties
+        properties: measureMap.get(isAdvanceAnalyticsChart ? splitLengend(series.legend) : series.properties.measureUniqueId) ?? series.properties
       };
     }).filter((series) => series.data[0].value !== 0);
   } catch (_) {
@@ -17586,9 +17608,7 @@ const ColumnChart = ({
         (data2.properties.alias || data2.properties.name || "Legend").replace(/ /g, "-");
         hideTooltipOnMouseOut();
       });
-      columnGroups.exit().remove().each(function(d) {
-        console.log("Exiting:", d.dimension, d.legend);
-      });
+      columnGroups.exit().remove();
     });
     gTag.selectAll(".parentGroup").raise();
   };
@@ -18316,7 +18336,7 @@ const CustomColumnChart = ({
       (d) => xScale(d.dimension) ? xScale(d.dimension) : null
     ).y(
       (d) => d.axis == axisTypes.primary ? yScaleLeft(d.value) : yScaleRight(d.value)
-    ).defined((d) => d.hideZero ? Boolean(d.value) : true).curve(getCurveType(formatOptions));
+    ).defined((d) => formatOptions?.plotArea?.hideZeroValues ? Boolean(d.value) : true).curve(getCurveType(formatOptions));
     let lines = gTag.selectAll(".lines.parentGroup").data([1]);
     lines = lines.enter().append("g").attr("class", "lines parentGroup").merge(lines);
     let lineGroups = lines.selectAll(".line-group").data(lineData, (d) => d.properties.legendUniqueId);
@@ -22183,7 +22203,7 @@ const LineChart = ({
         (d2) => d2.properties.lineStyle !== "None" ? d2.properties.lineWidth : 0
       ).attr(
         "hoverId",
-        (d.properties.alias || lineGroups.properties.name || "Legend").replace(/\s+/g, "-")
+        (d.properties.alias || d.properties.name || "Legend").replace(/\s+/g, "-")
       ).attr("d", (d2) => lineGenerator(d2.data));
     });
     lineGroups.exit().remove();
@@ -22221,7 +22241,7 @@ const LineChart = ({
       xAxis,
       dimensionHeightWidthArray,
       height,
-      innerWidth2 / xScale.length,
+      innerWidth2 / filteredDimension.length,
       isDateType,
       innerWidth2,
       innerHeight2,
@@ -29137,8 +29157,16 @@ const Treemap = ({ data, formatOptions, chartId }) => {
         }
         chartData = chartData.map((d) => {
           let value2 = d.data.data[valueIndex].value;
-          d.data.properties["themeColor"] = colorScale(value2.toString());
-          return d;
+          return {
+            ...d,
+            data: {
+              ...d.data,
+              properties: {
+                ...d.data.properties,
+                themeColor: colorScale(value2.toString())
+              }
+            }
+          };
         });
         appendColorScale(
           startColor,
@@ -29972,6 +30000,11 @@ const PyramidChart = ({
       annotationsList = [];
       seriesData.forEach((d, i) => {
         try {
+          const type = chartFormatOptions.annotation.annotationVisibility;
+          const lastIndex = seriesData.length - 1;
+          if (type === dataLabelPositionType.none || type === dataLabelPositionType.startOnly && i !== 0 || type === dataLabelPositionType.endOnly && i !== lastIndex || type === dataLabelPositionType.startAndEndBoth && i !== 0 && i !== lastIndex) {
+            return;
+          }
           let singleAnnotation = {
             note: {
               title: chartFormatOptions.plotArea.dataLabelName ? d.properties.alias : "",
@@ -30748,7 +30781,8 @@ const Speedometer = ({
         }
       }
       let valuefontStyle = chartFormatOptions.pointerValue.pointerValueFontStyle;
-      let comparedValue = chartAreaTagG.append("g").attr("class", "label").attr("transform", positionTransformString2);
+      chartAreaTagG.selectAll(".pointerValueText").remove();
+      let comparedValue = chartAreaTagG.append("g").attr("class", "pointerValueText").attr("transform", positionTransformString2);
       comparedValue.selectAll("text").data(["chartData.dataArray[1].maximumMeasure"]).enter().append("text").attr("dy", "24").attr("text-anchor", "middle").attr("font-size", chartFormatOptions.pointerValue.pointerValueFontSize).attr(
         "fill",
         chartFormatOptions.pointerValue.pointerValueColor !== commonColors.white ? chartFormatOptions.pointerValue.pointerValueColor : "none"
@@ -30765,11 +30799,7 @@ const Speedometer = ({
         "font-family",
         chartFormatOptions.pointerValue.pointerValueFontFamily
       ).text(
-        (d) => `${KPIName}: ${!chartFormatOptions.pointerValue.pointerValueAlias && d != 0 ? getNumberWithFormatFunction(
-          "None",
-          chartFormatOptions.pointerValue.pointerValueNumberFormat,
-          chartFormatOptions.pointerValue.pointerValueDecimalPrecision
-        )(ChartData[1].data[0].value) : chartFormatOptions.pointerValue.pointerValueAliasText}`
+        (d) => `${KPIName}: ${!chartFormatOptions.pointerValue.pointerValueAlias && d != 0 ? connectorNumberFormat2(ChartData[0].data[0].value, ChartData[1].data[0].value) : chartFormatOptions.pointerValue.pointerValueAliasText}`
       ).attr(
         "visibility",
         chartFormatOptions.plotArea.dataLabels ? "visible" : "hidden"
@@ -30778,6 +30808,45 @@ const Speedometer = ({
       logError$2(fileName2, "setPointerValueText", error);
     }
   }
+  function connectorNumberFormat2(numerator, denominator) {
+    try {
+      let Measure = numerator - denominator;
+      let noOfYears = 1;
+      let KPI = parseInt(
+        chartFormatOptions.pointerValue.connectorKPIforSpeedometer
+      );
+      let formatter;
+      let value2;
+      const decimalValues = chartFormatOptions.pointerValue.pointerValueDecimalPrecision;
+      switch (KPI) {
+        case 1:
+          Measure = denominator;
+          break;
+        case 2:
+          Measure = Math.abs(Measure);
+          break;
+        case 3:
+          formatter = `.${decimalValues}%`;
+          Measure = Math.pow(denominator / numerator, 1 / noOfYears) - 1;
+          value2 = format(formatter)(Measure);
+          return value2;
+        case 4:
+          formatter = `.${decimalValues}%`;
+          Measure = Math.round(denominator / numerator * 100 - 100) / 100;
+          value2 = format(formatter)(Measure);
+          return value2;
+      }
+      isNaN(Measure) ? Measure = 0 : Measure;
+      return getNumberWithFormatFunction(
+        chartFormatOptions.pointerValue.pointerValueDisplayUnits,
+        chartFormatOptions.pointerValue.pointerValueNumberFormat,
+        decimalValues
+      )(Measure);
+    } catch (error) {
+      logError$2(fileName2, "connectorNumberFormat", error);
+      return "";
+    }
+  }
   return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { style: { width: "100%", height: "100%" }, children: /* @__PURE__ */ jsxRuntimeExports.jsx(
     "svg",
     {
@@ -30857,6 +30926,31 @@ const RadialBarChart = ({
       logError("RadialBarChart.tsx", "loopOverChartData", error);
     }
   };
+  const getModifiedDataForLabels = (data) => {
+    try {
+      const dataLabelType = chartFormatOptions.plotArea.dataLabelsOptions;
+      switch (dataLabelType) {
+        case dataLabelPositionType.automatic:
+          return data.map((item, index2) => {
+            return {
+              ...item,
+              index: index2
+            };
+          });
+        case dataLabelPositionType.startOnly:
+          return [{ ...data[0], index: 0 }];
+        case dataLabelPositionType.endOnly:
+          return [{ ...data[data.length - 1], index: data.length - 1 }];
+        case dataLabelPositionType.startAndEndBoth:
+          return [{ ...data[0], index: 0 }, { ...data[data.length - 1], index: data.length - 1 }];
+        case dataLabelPositionType.none:
+          return [];
+      }
+    } catch (error) {
+      logError("RadialBarChart.tsx", "getModifiedDataForLabels", error);
+      return data;
+    }
+  };
   const initRadialBarChart = () => {
     try {
       let arcTween = function(d, i) {
@@ -30984,7 +31078,7 @@ const RadialBarChart = ({
         "visibility",
         chartFormatOptions.plotArea.axialAxis ? "visible" : "hidden"
       );
-      let arcs = svg2.attr("class", "data").selectAll("path").data(ChartData).enter().append("path").attr("class", "parentGroup").attr("hoverId", (d) => d.data[0].legend).style("fill", (d, i) => d.properties.color).on("mousemove", (event2, d) => {
+      let arcs = svg2.attr("class", "data").selectAll("path").data(ChartData).enter().append("path").attr("class", "parentGroup").attr("hoverId", (d) => d.data[0].legend.replaceAll(" ", "-")).style("fill", (d, i) => d.properties.color).on("mousemove", (event2, d) => {
         showTooltipOnMouseMove(
           [
             {
@@ -31012,7 +31106,8 @@ const RadialBarChart = ({
         (d, i) => chartFormatOptions.plotArea.arcTransition ? i * 200 : 0
       ).duration(chartFormatOptions.plotArea.arcTransition ? 500 : 0).attrTween("d", arcTween);
       if (chartFormatOptions.plotArea.dataLabels) {
-        svg2.selectAll(".arc-label-" + chartId).data(ChartData).enter().append("text").attr("class", "arc-label-" + chartId).attr("class", "parentGroup").attr("text-anchor", "start").attr("dy", (d, i) => (getOuterRadius(i) - getInnerRadius(i)) / 1.75).append("textPath").attr("xlink:href", (d, i) => `#arc-path-${i}-` + chartId).style("startOffset", "50%").attr("hoverId", (d) => d.legend.replaceAll(" ", "-")).text(
+        const labelsData = getModifiedDataForLabels(ChartData);
+        svg2.selectAll(".arc-label-" + chartId).data(labelsData).enter().append("text").attr("class", "arc-label-" + chartId).attr("class", "parentGroup").attr("text-anchor", "start").attr("dy", (d, i) => (getOuterRadius(d.index ?? i) - getInnerRadius(d.index ?? i)) / 1.75).append("textPath").attr("xlink:href", (d, i) => `#arc-path-${d.index ?? i}-` + chartId).style("startOffset", "50%").attr("hoverId", (d) => d.legend.replaceAll(" ", "-")).text(
           (d) => `  ${d.properties.alias} 
            ${chartFormatOptions.plotArea.dataLabelValue ? getNumberWithFormatFunction(
             chartFormatOptions.plotArea.plotAreaDisplayUnits,
@@ -31489,28 +31584,27 @@ const WordCloud = ({
     initSvg(svgRef, width, height, chartFormatOptions);
     chartAreaTagG = initChartArea(svg, margins);
     drawChartTitle(svgRef, chartTitleHeight, width, chartFormatOptions);
-    calculateWordCloudData(seriesData);
+    calculateWordCloudData();
     drawWordCloudChart();
   };
-  const calculateWordCloudData = (seriesData2) => {
+  const calculateWordCloudData = () => {
     try {
       totalMeasureValue = 0;
-      seriesData2 = seriesData2.map((item) => {
+      seriesData = seriesData.map((item) => {
         let value2 = item.data[0].value;
         totalMeasureValue += value2;
+        if (chartFormatOptions.plotArea.hideZeroValues && value2 == 0) {
+          return null;
+        }
         if (value2 < min2) {
           min2 = value2;
         }
         if (value2 > max2) {
           max2 = value2;
         }
-        if (chartFormatOptions.plotArea.hideZeroValues && item[0].value != 0) {
-          return null;
-        } else {
-          return item;
-        }
+        return item;
       });
-      seriesData2 = seriesData2.filter((item) => item !== null);
+      seriesData = seriesData.filter((item) => item !== null);
       scale2 = linear$1().domain([min2, max2]).range([12, 70]);
     } catch (error) {
       logError$2(fileName$2, "calculateWordCloudData", error);
@@ -32565,8 +32659,8 @@ function selector(selector2) {
 function selection_select(select2) {
   if (typeof select2 !== "function") select2 = selector(select2);
   for (var groups = this._groups, m = groups.length, subgroups = new Array(m), j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, subgroup = subgroups[j] = new Array(n), node, subnode, i = 0; i < n; ++i) {
-      if ((node = group[i]) && (subnode = select2.call(node, node.__data__, i, group))) {
+    for (var group2 = groups[j], n = group2.length, subgroup = subgroups[j] = new Array(n), node, subnode, i = 0; i < n; ++i) {
+      if ((node = group2[i]) && (subnode = select2.call(node, node.__data__, i, group2))) {
         if ("__data__" in node) subnode.__data__ = node.__data__;
         subgroup[i] = subnode;
       }
@@ -32585,9 +32679,9 @@ function selectorAll(selector2) {
 function selection_selectAll(select2) {
   if (typeof select2 !== "function") select2 = selectorAll(select2);
   for (var groups = this._groups, m = groups.length, subgroups = [], parents = [], j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, node, i = 0; i < n; ++i) {
-      if (node = group[i]) {
-        subgroups.push(select2.call(node, node.__data__, i, group));
+    for (var group2 = groups[j], n = group2.length, node, i = 0; i < n; ++i) {
+      if (node = group2[i]) {
+        subgroups.push(select2.call(node, node.__data__, i, group2));
         parents.push(node);
       }
     }
@@ -32602,8 +32696,8 @@ function matcher(selector2) {
 function selection_filter(match) {
   if (typeof match !== "function") match = matcher(match);
   for (var groups = this._groups, m = groups.length, subgroups = new Array(m), j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, subgroup = subgroups[j] = [], node, i = 0; i < n; ++i) {
-      if ((node = group[i]) && match.call(node, node.__data__, i, group)) {
+    for (var group2 = groups[j], n = group2.length, subgroup = subgroups[j] = [], node, i = 0; i < n; ++i) {
+      if ((node = group2[i]) && match.call(node, node.__data__, i, group2)) {
         subgroup.push(node);
       }
     }
@@ -32644,10 +32738,10 @@ function constant$2(x2) {
   };
 }
 var keyPrefix = "$";
-function bindIndex(parent, group, enter, update, exit, data) {
-  var i = 0, node, groupLength = group.length, dataLength = data.length;
+function bindIndex(parent, group2, enter, update, exit, data) {
+  var i = 0, node, groupLength = group2.length, dataLength = data.length;
   for (; i < dataLength; ++i) {
-    if (node = group[i]) {
+    if (node = group2[i]) {
       node.__data__ = data[i];
       update[i] = node;
     } else {
@@ -32655,16 +32749,16 @@ function bindIndex(parent, group, enter, update, exit, data) {
     }
   }
   for (; i < groupLength; ++i) {
-    if (node = group[i]) {
+    if (node = group2[i]) {
       exit[i] = node;
     }
   }
 }
-function bindKey(parent, group, enter, update, exit, data, key) {
-  var i, node, nodeByKeyValue = {}, groupLength = group.length, dataLength = data.length, keyValues = new Array(groupLength), keyValue;
+function bindKey(parent, group2, enter, update, exit, data, key) {
+  var i, node, nodeByKeyValue = {}, groupLength = group2.length, dataLength = data.length, keyValues = new Array(groupLength), keyValue;
   for (i = 0; i < groupLength; ++i) {
-    if (node = group[i]) {
-      keyValues[i] = keyValue = keyPrefix + key.call(node, node.__data__, i, group);
+    if (node = group2[i]) {
+      keyValues[i] = keyValue = keyPrefix + key.call(node, node.__data__, i, group2);
       if (keyValue in nodeByKeyValue) {
         exit[i] = node;
       } else {
@@ -32683,7 +32777,7 @@ function bindKey(parent, group, enter, update, exit, data, key) {
     }
   }
   for (i = 0; i < groupLength; ++i) {
-    if ((node = group[i]) && nodeByKeyValue[keyValues[i]] === node) {
+    if ((node = group2[i]) && nodeByKeyValue[keyValues[i]] === node) {
       exit[i] = node;
     }
   }
@@ -32699,8 +32793,8 @@ function selection_data(value2, key) {
   var bind = key ? bindKey : bindIndex, parents = this._parents, groups = this._groups;
   if (typeof value2 !== "function") value2 = constant$2(value2);
   for (var m = groups.length, update = new Array(m), enter = new Array(m), exit = new Array(m), j = 0; j < m; ++j) {
-    var parent = parents[j], group = groups[j], groupLength = group.length, data = value2.call(parent, parent && parent.__data__, j, parents), dataLength = data.length, enterGroup = enter[j] = new Array(dataLength), updateGroup = update[j] = new Array(dataLength), exitGroup = exit[j] = new Array(groupLength);
-    bind(parent, group, enterGroup, updateGroup, exitGroup, data, key);
+    var parent = parents[j], group2 = groups[j], groupLength = group2.length, data = value2.call(parent, parent && parent.__data__, j, parents), dataLength = data.length, enterGroup = enter[j] = new Array(dataLength), updateGroup = update[j] = new Array(dataLength), exitGroup = exit[j] = new Array(groupLength);
+    bind(parent, group2, enterGroup, updateGroup, exitGroup, data, key);
     for (var i0 = 0, i1 = 0, previous, next; i0 < dataLength; ++i0) {
       if (previous = enterGroup[i0]) {
         if (i0 >= i1) i1 = i0 + 1;
@@ -32740,8 +32834,8 @@ function selection_merge(selection2) {
 }
 function selection_order() {
   for (var groups = this._groups, j = -1, m = groups.length; ++j < m; ) {
-    for (var group = groups[j], i = group.length - 1, next = group[i], node; --i >= 0; ) {
-      if (node = group[i]) {
+    for (var group2 = groups[j], i = group2.length - 1, next = group2[i], node; --i >= 0; ) {
+      if (node = group2[i]) {
         if (next && node.compareDocumentPosition(next) ^ 4) next.parentNode.insertBefore(node, next);
         next = node;
       }
@@ -32755,8 +32849,8 @@ function selection_sort(compare) {
     return a2 && b ? compare(a2.__data__, b.__data__) : !a2 - !b;
   }
   for (var groups = this._groups, m = groups.length, sortgroups = new Array(m), j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, sortgroup = sortgroups[j] = new Array(n), node, i = 0; i < n; ++i) {
-      if (node = group[i]) {
+    for (var group2 = groups[j], n = group2.length, sortgroup = sortgroups[j] = new Array(n), node, i = 0; i < n; ++i) {
+      if (node = group2[i]) {
         sortgroup[i] = node;
       }
     }
@@ -32782,8 +32876,8 @@ function selection_nodes() {
 }
 function selection_node() {
   for (var groups = this._groups, j = 0, m = groups.length; j < m; ++j) {
-    for (var group = groups[j], i = 0, n = group.length; i < n; ++i) {
-      var node = group[i];
+    for (var group2 = groups[j], i = 0, n = group2.length; i < n; ++i) {
+      var node = group2[i];
       if (node) return node;
     }
   }
@@ -32801,8 +32895,8 @@ function selection_empty() {
 }
 function selection_each(callback) {
   for (var groups = this._groups, j = 0, m = groups.length; j < m; ++j) {
-    for (var group = groups[j], i = 0, n = group.length, node; i < n; ++i) {
-      if (node = group[i]) callback.call(node, node.__data__, i, group);
+    for (var group2 = groups[j], i = 0, n = group2.length, node; i < n; ++i) {
+      if (node = group2[i]) callback.call(node, node.__data__, i, group2);
     }
   }
   return this;
@@ -33045,8 +33139,8 @@ if (typeof document !== "undefined") {
     filterEvents = { mouseenter: "mouseover", mouseleave: "mouseout" };
   }
 }
-function filterContextListener(listener, index2, group) {
-  listener = contextListener(listener, index2, group);
+function filterContextListener(listener, index2, group2) {
+  listener = contextListener(listener, index2, group2);
   return function(event2) {
     var related = event2.relatedTarget;
     if (!related || related !== this && !(related.compareDocumentPosition(this) & 8)) {
@@ -33054,10 +33148,10 @@ function filterContextListener(listener, index2, group) {
     }
   };
 }
-function contextListener(listener, index2, group) {
+function contextListener(listener, index2, group2) {
   return function(event1) {
     try {
-      listener.call(this, this.__data__, index2, group);
+      listener.call(this, this.__data__, index2, group2);
     } finally {
     }
   };
@@ -33086,8 +33180,8 @@ function onRemove(typename) {
 }
 function onAdd(typename, value2, capture) {
   var wrap3 = filterEvents.hasOwnProperty(typename.type) ? filterContextListener : contextListener;
-  return function(d, i, group) {
-    var on = this.__on, o, listener = wrap3(value2, i, group);
+  return function(d, i, group2) {
+    var on = this.__on, o, listener = wrap3(value2, i, group2);
     if (on) for (var j = 0, m = on.length; j < m; ++j) {
       if ((o = on[j]).type === typename.type && o.name === typename.name) {
         this.removeEventListener(o.type, o.listener, o.capture);
@@ -33364,7 +33458,7 @@ var STARTED = 3;
 var RUNNING = 4;
 var ENDING = 5;
 var ENDED = 6;
-function schedule(node, name, id2, index2, group, timing) {
+function schedule(node, name, id2, index2, group2, timing) {
   var schedules = node.__transition;
   if (!schedules) node.__transition = {};
   else if (id2 in schedules) return;
@@ -33372,7 +33466,7 @@ function schedule(node, name, id2, index2, group, timing) {
     name,
     index: index2,
     // For context during callback.
-    group,
+    group: group2,
     // For context during callback.
     on: emptyOn,
     tween: emptyTween,
@@ -34164,8 +34258,8 @@ function transition_ease(value2) {
 function transition_filter(match) {
   if (typeof match !== "function") match = matcher(match);
   for (var groups = this._groups, m = groups.length, subgroups = new Array(m), j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, subgroup = subgroups[j] = [], node, i = 0; i < n; ++i) {
-      if ((node = group[i]) && match.call(node, node.__data__, i, group)) {
+    for (var group2 = groups[j], n = group2.length, subgroup = subgroups[j] = [], node, i = 0; i < n; ++i) {
+      if ((node = group2[i]) && match.call(node, node.__data__, i, group2)) {
         subgroup.push(node);
       }
     }
@@ -34219,8 +34313,8 @@ function transition_select(select2) {
   var name = this._name, id2 = this._id;
   if (typeof select2 !== "function") select2 = selector(select2);
   for (var groups = this._groups, m = groups.length, subgroups = new Array(m), j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, subgroup = subgroups[j] = new Array(n), node, subnode, i = 0; i < n; ++i) {
-      if ((node = group[i]) && (subnode = select2.call(node, node.__data__, i, group))) {
+    for (var group2 = groups[j], n = group2.length, subgroup = subgroups[j] = new Array(n), node, subnode, i = 0; i < n; ++i) {
+      if ((node = group2[i]) && (subnode = select2.call(node, node.__data__, i, group2))) {
         if ("__data__" in node) subnode.__data__ = node.__data__;
         subgroup[i] = subnode;
         schedule(subgroup[i], name, id2, i, subgroup, get2(node, id2));
@@ -34233,9 +34327,9 @@ function transition_selectAll(select2) {
   var name = this._name, id2 = this._id;
   if (typeof select2 !== "function") select2 = selectorAll(select2);
   for (var groups = this._groups, m = groups.length, subgroups = [], parents = [], j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, node, i = 0; i < n; ++i) {
-      if (node = group[i]) {
-        for (var children2 = select2.call(node, node.__data__, i, group), child, inherit2 = get2(node, id2), k2 = 0, l = children2.length; k2 < l; ++k2) {
+    for (var group2 = groups[j], n = group2.length, node, i = 0; i < n; ++i) {
+      if (node = group2[i]) {
+        for (var children2 = select2.call(node, node.__data__, i, group2), child, inherit2 = get2(node, id2), k2 = 0, l = children2.length; k2 < l; ++k2) {
           if (child = children2[k2]) {
             schedule(child, name, id2, k2, children2, inherit2);
           }
@@ -34351,10 +34445,10 @@ function transition_textTween(value2) {
 function transition_transition() {
   var name = this._name, id0 = this._id, id1 = newId();
   for (var groups = this._groups, m = groups.length, j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, node, i = 0; i < n; ++i) {
-      if (node = group[i]) {
+    for (var group2 = groups[j], n = group2.length, node, i = 0; i < n; ++i) {
+      if (node = group2[i]) {
         var inherit2 = get2(node, id0);
-        schedule(node, name, id1, i, group, {
+        schedule(node, name, id1, i, group2, {
           time: inherit2.time + inherit2.delay + inherit2.duration,
           delay: 0,
           duration: inherit2.duration,
@@ -34449,9 +34543,9 @@ function selection_transition(name) {
     id2 = newId(), (timing = defaultTiming).time = now(), name = name == null ? null : name + "";
   }
   for (var groups = this._groups, m = groups.length, j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, node, i = 0; i < n; ++i) {
-      if (node = group[i]) {
-        schedule(node, name, id2, i, group, timing || inherit(node, id2));
+    for (var group2 = groups[j], n = group2.length, node, i = 0; i < n; ++i) {
+      if (node = group2[i]) {
+        schedule(node, name, id2, i, group2, timing || inherit(node, id2));
       }
     }
   }
@@ -35671,7 +35765,7 @@ const SankeyChart = ({
           break;
         case TSankeyDataLabelPostion.right:
           xAndYCoordinate = [1, 5];
-          widthAndHeight = [maxNodeLabelWidth, innerHeight2];
+          widthAndHeight = [innerWidth2 - maxNodeLabelWidth, innerHeight2];
           break;
         case TSankeyDataLabelPostion.left:
           xAndYCoordinate = [maxNodeLabelWidth, 5];
@@ -55178,7 +55272,8 @@ const WaterfallChart = ({
       dataTableHeight,
       innerWidth2,
       innerHeight2,
-      chartType
+      chartType,
+      chartId
     );
     initScale();
     initAxis();
@@ -55479,7 +55574,7 @@ const WaterfallChart = ({
           (d) => xScale(
             !isAdvancedWaterfall ? d.data.dimension || d.data.legend : d.data.xKey
           )
-        ).attr("y", (d) => d[1] ? yScaleLeft(d[1]) : 0).attr(
+        ).attr("y", (d) => d[1] ? yScaleLeft(d[1]) : 0).attr("clip-path", `url(#${chartId}-clip)`).attr(
           "height",
           (d) => d[1] ? yScaleLeft(d[0]) - yScaleLeft(d[1]) : 0
         ).attr("width", xScale.bandwidth()).attr(
@@ -55880,26 +55975,8 @@ const TornadoChart = ({
       chartType
     );
     initScale();
-    initAxis();
-    initYaxisBar(
-      formatOptions,
-      gTag,
-      xLabel,
-      innerHeight2,
-      innerWidth2,
-      yAxisLeft,
-      yAxisRight,
-      xScale,
-      chartJSON.yMaxLeft,
-      chartJSON.dimensionList,
-      chartType,
-      isDateType,
-      width,
-      dimensionHeightWidthArray,
-      columnWidth,
-      yScaleLeft
-    );
-    horizontalScrollBar2(seriesData, height, svg, margin, innerWidth2);
+    getXAxis();
+    initXaxisBar(formatOptions, gTag, xLabel, innerHeight2, innerWidth2, xAxis);
     if (formatOptions.dataTableProperties && formatOptions.dataTableProperties.dataTable) {
       if (formatOptions.xAxisLabel.xAxisPosition != "1")
         formatOptions.xAxisLabel.xAxisLabelVisibility = false;
@@ -55981,6 +56058,21 @@ const TornadoChart = ({
       chartId,
       staticLegendShape.rectangle
     );
+    horizontalScrollBar2(
+      seriesData,
+      height,
+      width,
+      svg,
+      margin,
+      innerWidth2,
+      scrollbarVisible,
+      visibleBars,
+      chartJSON,
+      scrollPosition,
+      false,
+      setAndUpdateChartData,
+      barChart
+    );
   };
   const mapSeriesDataWithLegendList = (seriesData2, legendList, isAdvanceAnalyticsChart2, formatOptions2) => {
     return seriesData2.map((series, index2) => {
@@ -56013,11 +56105,11 @@ const TornadoChart = ({
   const preProcessChartData = () => {
     let processedSeriesData;
     if (!isAdvanceAnalyticsChart) {
-      const firstMeasure = "0~$~" + seriesData[0]?.properties.currentMeasure;
+      const firstMeasure = seriesData[0]?.properties?.measureUniqueId;
       let yMaxLeft = 0;
       let yMaxRight = -Infinity;
       processedSeriesData = seriesData.map((series, index2) => {
-        const isFirstMeasure = index2 + "~$~" + series.properties.currentMeasure === firstMeasure;
+        const isFirstMeasure = series.properties.measureUniqueId === firstMeasure;
         const newData = series.data.map((point2) => {
           const newValue = isFirstMeasure ? -Math.abs(point2.value) : Math.abs(point2.value);
           return {
@@ -56053,10 +56145,8 @@ const TornadoChart = ({
         !isAdvanceAnalyticsChart ? processedSeriesData : seriesData
       )
     );
-    filteredDimension = !formatOptions.plotArea.fitChart ? chartJSON.dimensionList.slice(
-      scrollPosition,
-      scrollPosition + visibleBars
-    ) : chartJSON.dimensionList;
+    seriesData = filteredData;
+    filteredDimension = chartJSON.dimensionList;
     if (formatOptions.plotArea.hideZeroValues) {
       chartJSON.hideZeroValues = true;
     }
@@ -56084,16 +56174,23 @@ const TornadoChart = ({
     getXScale();
   };
   const getXScale = () => {
-    yScaleLeft = point$7().domain(chartJSON.dimensionList).range([innerHeight2, 0]).padding(0.5);
+    yScaleLeft = point$7().domain(filteredDimension).range([innerHeight2, 0]).padding(0.5);
   };
   const initAxis = () => {
-    getXAxis();
     yAxisLeft = axisLeft(yScaleLeft).tickSize(
-      formatOptions.plotArea.gridLinesVisibility ? formatOptions.plotArea.gridLinesHorizontal ? -(innerWidth2 - xScaleForLegends(0)) : 0 : 0
-    ).tickSizeOuter(0).tickValues(responsiveXaxisLabel(chartJSON.dimensionList, innerHeight2));
+      getHorizontalGridLinesTickSize(
+        formatOptions,
+        innerWidth2 - xScaleForLegends(0),
+        0
+      )
+    ).tickSizeOuter(0).tickValues(responsiveXaxisLabel(filteredDimension, innerHeight2));
     yAxisRight = axisRight(yScaleLeft).tickSize(
-      formatOptions.plotArea.gridLinesVisibility ? formatOptions.plotArea.gridLinesHorizontal ? -xScaleForLegends(0) : 0 : 0
-    ).tickSizeOuter(0).tickValues(responsiveXaxisLabel(chartJSON.dimensionList, innerWidth2));
+      getHorizontalGridLinesTickSize(
+        formatOptions,
+        xScaleForLegends(0),
+        0
+      )
+    ).tickSizeOuter(0).tickValues(responsiveXaxisLabel(filteredDimension, innerWidth2));
   };
   const getXAxis = () => {
     xAxis = axisBottom(xScaleForLegends).tickFormat(
@@ -56189,74 +56286,152 @@ const TornadoChart = ({
     innerWidth2 = width - margin2.left - margin2.right;
     innerHeight2 = height - margin2.bottom - margin2.top;
   };
-  const horizontalScrollBar2 = (seriesData2, height2, svg2, margin2, innerWidth22) => {
-    if (!formatOptions.plotArea.fitChart) {
-      const scrollMax = seriesData2[0].data.length - visibleBars;
-      const scrollbarY = height2 - 20;
-      filteredDimension = chartJSON.dimensionList.slice(
-        scrollPosition,
-        scrollPosition + visibleBars
-      );
-      getXScale();
-      filteredData = JSON.parse(JSON.stringify(seriesData2));
-      filteredData.forEach(
-        (data2, i) => filteredData[i].data = data2.data.filter(
-          (d) => filteredDimension.includes(d.dimension)
-        )
-      );
-      getXAxis();
-      svg2.append("rect").attr("x", margin2.left).attr("y", scrollbarY).attr("width", innerWidth22).attr("height", 8).attr("fill", "#ddd").attr("rx", 4);
-      const handleWidth = innerWidth22 * visibleBars / chartJSON.dimensionList.length;
-      const handle = svg2.append("rect").attr("x", margin2.left).attr("y", scrollbarY).attr("width", handleWidth).attr("height", 8).attr("fill", "#999").attr("rx", 4).style("cursor", "ew-resize").call(
+  const setAndUpdateChartData = (fDimension, fData, fVisibleBars) => {
+    filteredData = fData;
+    filteredDimension = fDimension;
+    visibleBars = fVisibleBars;
+    drawColumnChart();
+  };
+  function createDataForAnnotation(chartData) {
+    const legendUniqueIdToLegendMap = /* @__PURE__ */ new Map();
+    chartData.forEach((d) => {
+      let obj = legendUniqueIdToLegendMap.get(d.properties.legendUniqueId);
+      if (obj) {
+        let array2 = obj.data ?? [];
+        array2.push(d.data[0]);
+        legendUniqueIdToLegendMap.set(d.properties.legendUniqueId, { ...obj, data: array2 });
+      } else {
+        obj = {
+          ...d,
+          data: [d.data[0]]
+        };
+        legendUniqueIdToLegendMap.set(d.properties.legendUniqueId, obj);
+      }
+    });
+    return legendUniqueIdToLegendMap.size > 0 ? Array.from(legendUniqueIdToLegendMap.keys()).map((d) => legendUniqueIdToLegendMap.get(d)) : chartData;
+  }
+  function horizontalScrollBar2(seriesData2, height2, width2, svg2, margin2, innerWidth22, scrollbarVisible2, visibleBars2, chartJSON2, scrollPosition2, isStackedChart, setAndUpdateChartData2, isBarChart = false) {
+    const updateFromScrollPosition = (pos, scrollMax, handleWidth, handle, mouseEvent) => {
+      try {
+        mouseEvent && (pos = scrollPosition2 + pos);
+        if (!chartJSON2 || !Array.isArray(chartJSON2.dimensionList) || !Array.isArray(seriesData2))
+          return;
+        pos = pos == null ? 0 : Number(pos);
+        scrollMax = scrollMax == null ? 0 : Number(scrollMax);
+        handleWidth = handleWidth == null ? 0 : Number(handleWidth);
+        scrollPosition2 = clamp(Math.round(pos), 0, Math.max(0, scrollMax));
+        visibleBars2 = typeof visibleBars2 === "number" ? visibleBars2 : 0;
+        const start2 = scrollPosition2;
+        const end = start2 + visibleBars2;
+        let filteredDimension2 = chartJSON2.dimensionList.slice(start2, end);
+        const isDefaultEntry = filteredDimension2[0] == chartTypes.TornadoDefaultEntry;
+        let filteredData2 = JSON.parse(JSON.stringify(seriesData2 || []));
+        filteredData2 = filteredData2.filter((d) => isDefaultEntry ? true : filteredDimension2.includes(d.legend.split(" - ")[1]));
+        const safeMarginLeft = margin2?.left ?? 0;
+        const safeMarginTop = margin2?.top ?? 0;
+        const safeInnerWidth = Number(innerWidth22) || 0;
+        const safeInnerHeight = Number(innerHeight2) || 0;
+        const safeHandleSize = Number(handleWidth) || 0;
+        const denom = scrollMax === 0 ? 1 : scrollMax;
+        if (isBarChart) {
+          const y2 = safeMarginTop + (safeInnerHeight - safeHandleSize) * (scrollMax === 0 ? 0 : scrollPosition2) / denom;
+          if (handle && typeof handle.attr === "function") {
+            handle.attr("y", y2);
+          }
+        } else {
+          const x2 = safeMarginLeft + (safeInnerWidth - safeHandleSize) * (scrollMax === 0 ? 0 : scrollPosition2) / denom;
+          if (handle && typeof handle.attr === "function") {
+            handle.attr("x", x2);
+          }
+        }
+        setAndUpdateChartData2(filteredDimension2, filteredData2, visibleBars2);
+      } catch (error) {
+        if (typeof logError$2 === "function")
+          logError$2("ColumnChart", "updateFromScrollPosition", error);
+      }
+    };
+    if (scrollbarVisible2) {
+      const innerHeight22 = height2 - margin2.top - margin2.bottom;
+      const scrollMax = Math.max(0, dimensionList.length - visibleBars2);
+      const scrollbarY = height2 - 8;
+      svg2.append("rect").attr("id", "scrollbarTrack").attr("x", isBarChart ? width2 - 8 : margin2.left).attr("y", isBarChart ? margin2.top : scrollbarY).attr("width", isBarChart ? 8 : innerWidth22).attr("height", isBarChart ? innerHeight22 : 8).attr("fill", "#ccc");
+      const handleWidth = (isBarChart ? innerHeight22 : innerWidth22) * visibleBars2 / chartJSON2.dimensionList.length;
+      const handle = svg2.append("rect").attr(
+        "x",
+        isBarChart ? width2 - 8 : margin2.left
+      ).attr("y", isBarChart ? margin2.top : scrollbarY).attr("width", isBarChart ? 8 : handleWidth).attr("height", isBarChart ? handleWidth : 8).attr("fill", "#999").style("cursor", isBarChart ? "ns-resize" : "ew-resize");
+      handle.call(
         drag$1().on("drag", (event2) => {
-          let x2 = Math.min(
-            Math.max(event2.x, margin2.left),
-            margin2.left + innerWidth22 - handleWidth
-          );
-          handle.attr("x", x2);
-          scrollPosition = Math.round(
-            (x2 - margin2.left) / (innerWidth22 - handleWidth) * scrollMax
-          );
-          filteredDimension = chartJSON.dimensionList.slice(
-            scrollPosition,
-            scrollPosition + visibleBars
-          );
-          getXScale();
-          filteredData = JSON.parse(JSON.stringify(seriesData2));
-          filteredData.forEach(
-            (data2, i) => filteredData[i].data = data2.data.filter(
-              (d) => filteredDimension.includes(d.dimension)
-            )
-          );
-          getXAxis();
-          drawColumnChart();
+          if (isBarChart) {
+            const y2 = clamp(
+              event2.y,
+              margin2.top,
+              margin2.top + innerHeight22 - handleWidth
+            );
+            const pos = (y2 - margin2.top) / (innerHeight22 - handleWidth) * (scrollMax || 1);
+            updateFromScrollPosition(pos, scrollMax, handleWidth, handle, false);
+            handle.attr("y", margin2.top + (innerHeight22 - handleWidth) * (scrollMax === 0 ? 0 : scrollPosition2) / (scrollMax === 0 ? 1 : scrollMax));
+          } else {
+            const x2 = clamp(
+              event2.x,
+              margin2.left,
+              margin2.left + innerWidth22 - handleWidth
+            );
+            const pos = (x2 - margin2.left) / (innerWidth22 - handleWidth) * (scrollMax || 1);
+            updateFromScrollPosition(pos, scrollMax, handleWidth, handle, false);
+            handle.attr("x", margin2.left + (innerWidth22 - handleWidth) * (scrollMax === 0 ? 0 : scrollPosition2) / (scrollMax === 0 ? 1 : scrollMax));
+          }
         })
       );
       svg2.on("wheel", (event2) => {
         event2.preventDefault();
         const scrollDelta = Math.abs(event2.deltaX) > Math.abs(event2.deltaY) ? event2.deltaX : event2.deltaY;
-        scrollPosition += scrollDelta > 0 ? 1 : -1;
-        scrollPosition = Math.max(0, Math.min(scrollPosition, scrollMax));
-        const x2 = margin2.left + (innerWidth22 - handleWidth) * scrollPosition / scrollMax;
-        handle.attr("x", x2);
-        getXScale();
-        filteredData = JSON.parse(JSON.stringify(seriesData2));
-        filteredData.forEach(
-          (data2, i) => filteredData[i].data = data2.data.filter(
-            (d) => filteredDimension.includes(d.dimension)
-          )
-        );
-        getXAxis();
-        drawColumnChart();
+        const step2 = scrollDelta > 0 ? 1 : -1;
+        updateFromScrollPosition(step2, scrollMax, handleWidth, handle, true);
+        if (isBarChart) {
+          const y2 = margin2.top + (innerHeight22 - handleWidth) * (scrollMax === 0 ? 0 : scrollPosition2) / (scrollMax === 0 ? 1 : scrollMax);
+          handle.attr("y", y2);
+        } else {
+          const x2 = margin2.left + (innerWidth22 - handleWidth) * (scrollMax === 0 ? 0 : scrollPosition2) / (scrollMax === 0 ? 1 : scrollMax);
+          handle.attr("x", x2);
+        }
       });
+    } else {
+      svg2.on("wheel", null);
     }
-    drawColumnChart();
-  };
+    updateFromScrollPosition(
+      0,
+      0,
+      0,
+      null,
+      true
+    );
+  }
   const drawColumnChart = () => {
-    initXaxisBar(formatOptions, gTag, xLabel, innerHeight2, innerWidth2, xAxis);
+    getXScale();
+    initAxis();
+    initYaxisBar(
+      formatOptions,
+      gTag,
+      xLabel,
+      innerHeight2,
+      innerWidth2,
+      yAxisLeft,
+      yAxisRight,
+      xScale,
+      chartJSON.yMaxLeft,
+      filteredDimension,
+      chartType,
+      isDateType,
+      width,
+      dimensionHeightWidthArray,
+      columnWidth,
+      yScaleLeft
+    );
     getChartType();
+    const dataForAnnotation = createDataForAnnotation(filteredData);
     commonAnnotations(
-      filteredData,
+      dataForAnnotation ?? [],
       yScaleLeft,
       xScale,
       null,
@@ -56296,7 +56471,7 @@ const TornadoChart = ({
     }
   ) });
 };
-const ClevelandDotPlot = ({
+const DotPlot = ({
   isDateType,
   formatOptions,
   data,
@@ -56305,7 +56480,7 @@ const ClevelandDotPlot = ({
 }) => {
   const chartId = crypto.randomUUID();
   let columnWidth = 0;
-  const chartType = chartTypes.ClevelandDotPlot;
+  const chartType = chartTypes.DotPlot;
   const svgRef = useRef();
   const seriesData = generalizedChartData(
     data.ChartData,
@@ -56362,16 +56537,16 @@ const ClevelandDotPlot = ({
   };
   useEffect(() => {
     try {
-      createStackHorizontalBarChart();
+      createDotPlot();
     } catch (error) {
       logError$2(
         "StackStackHorizontalBarchart",
-        "createStackHorizontalBarChart",
+        "createDotPlot",
         error
       );
     }
   }, [formatOptions]);
-  const createStackHorizontalBarChart = () => {
+  const createDotPlot = () => {
     ({ formatOptions, svg, width, height } = firstFunctionBeforeRender$1(
       svgRef,
       formatOptions
@@ -56599,32 +56774,64 @@ const ClevelandDotPlot = ({
   };
   const getChartType = (lineData) => {
     lineData.forEach((lData) => {
-      lData.data.forEach((cData) => {
-        cData.hideZero = lData.properties.hideZeroValues;
-        cData.axis = lData.properties.axis;
-        cData["properties"] = lData.properties;
+      lData.data.forEach((d) => {
+        d.markerShape = lData.properties.markerShape || "Circle";
+        d.markerSize = lData.properties.markerSize || 6;
+        d.markerColor = lData.properties.markerColor || lData.properties.color;
+        d.alias = lData.properties.alias;
+        d.lineStyle = lData.properties.lineStyle;
       });
     });
-    lineData.forEach((data2, index2) => {
+    const groupedData = group(
+      lineData.flatMap(
+        (l) => l.data.map((d) => ({
+          ...d,
+          color: l.properties.color
+        }))
+      ),
+      (d) => d.dimension
+    );
+    const lineGroups = gTag.selectAll(".cleveland-line-group").data(Array.from(groupedData), ([d]) => d);
+    const lineEnter = lineGroups.enter().append("g").attr("class", "cleveland-line-group");
+    lineEnter.append("line").merge(lineGroups.select("line")).attr("y1", ([dim]) => yScale(dim)).attr("y2", ([dim]) => yScale(dim)).attr(
+      "x1",
+      ([, v]) => xScaleBottom(Math.min(v[0]?.value ?? 0, v[1]?.value ?? 0))
+    ).attr(
+      "x2",
+      ([, v]) => xScaleBottom(Math.max(v[0]?.value ?? 0, v[1]?.value ?? 0))
+    ).attr("stroke", "#c7c7c7").attr("stroke-width", 2).attr("stroke-dasharray", (d) => {
+      switch (d[1][0].lineStyle) {
+        case staticLineStyle.dotted:
+          return `0,${d[1][0].lineStyle + 2}`;
+        case staticLineStyle.dashed:
+          return strokeDashValues;
+        default:
+          return "";
+      }
+    }).attr(
+      "stroke-linecap",
+      (d) => d[1][0].lineStyle === staticLineStyle.dotted ? strokeLineCap.round : ""
+    );
+    lineGroups.exit().remove();
+    lineData.forEach((data2) => {
       let column = gTag.selectAll(".parentGroup").data([data2], (d) => d.properties.legendUniqueId);
-      column = column.enter().append("g").attr("class", `column parentGroup`).merge(column);
-      let columnGroups = column.selectAll(".column-group").data(data2.data, (d) => d.dimension);
-      let columnGroupsEnter = columnGroups.enter().append("g").attr("class", "column-group").attr(
+      column = column.enter().append("g").attr("class", "parentGroup").attr(
         "hoverId",
-        (data2.properties.alias || data2.properties.name || "Legend").replace(
-          /\s+/g,
-          "-"
-        )
-      ).attr(
-        "transform",
-        (d) => `translate(0,${yScale(d.dimension)})`
-      );
-      columnGroupsEnter.merge(columnGroups).attr(
-        "transform",
-        (d) => `translate(0,${yScale(d.dimension)})`
-      );
-      columnGroupsEnter.append("line").attr("class", "cleveland-line").attr("x1", (d) => xScaleBottom(0)).attr("x2", (d) => xScaleBottom(d.value)).attr("y1", 0).attr("y2", 0).attr("stroke", "#c7c7c7").attr("stroke-width", 2);
-      columnGroupsEnter.append("circle").attr("class", "cleveland-dot").attr("cx", (d) => xScaleBottom(d.value)).attr("cy", 0).attr("r", 6).attr("fill", data2.properties.color).attr("opacity", 0.9).on("mousemove", (event2, d) => {
+        (data2.properties.alias || data2.properties.name || "Legend").replace(/\s+/g, "-")
+      ).merge(column);
+      let columnGroups = column.selectAll(".column-group").data(data2.data, (d) => d.dimension);
+      let columnGroupsEnter = columnGroups.enter().append("g").attr("class", "column-group");
+      columnGroupsEnter.append("path").attr("class", "cleveland-dot").merge(columnGroups.select("path")).attr(
+        "d",
+        (d) => Symbol$1().type(Markershapes(d.markerShape)).size((d.markerSize || 6) * 70)()
+      ).attr("transform", (d) => {
+        const x2 = xScaleBottom(d.value);
+        const y2 = yScale(d.dimension);
+        return `translate(${x2},${y2})`;
+      }).attr("fill", (d) => data2.properties.color).attr("opacity", 0.9).attr(
+        "visibility",
+        () => formatOptions.marker?.markerVisibility ? "visible" : "hidden"
+      ).on("mousemove", (event2, d) => {
         showTooltipOnMouseMove(
           [
             {
@@ -56642,7 +56849,7 @@ const ClevelandDotPlot = ({
             },
             {
               key: "Legend",
-              value: d.legend
+              value: d.alias
             }
           ],
           formatOptions,
@@ -56652,8 +56859,10 @@ const ClevelandDotPlot = ({
         let legend = (data2.properties.alias || data2.properties.name || "Legend").replace(/ /g, "-");
         selectAll(".parentGroup").classed("highlight", false).classed("unhighlight", true);
         selectAll('[hoverId="' + legend + '"]').classed("highlight", true).classed("unhighlight", false);
+        select$2(event2.currentTarget.parentNode).selectAll(".halo").data([d]).join("circle").attr("class", "halo").attr("cx", xScaleBottom(d.value)).attr("cy", yScale(d.dimension)).attr("r", (d.markerSize || 6) * 3).attr("fill", d.markerColor).attr("opacity", 0.4);
       }).on("mouseout", () => {
         selectAll(".parentGroup").classed("highlight", false).classed("unhighlight", false);
+        selectAll(".halo").remove();
         hideTooltipOnMouseOut();
       });
       columnGroups.exit().remove();
@@ -56668,9 +56877,9 @@ const ClevelandDotPlot = ({
     filteredData = fData;
     filteredDimension = fDimension;
     visibleBars = fVisibleBars;
-    drawLineChart();
+    drawDotPlot();
   };
-  const drawLineChart = () => {
+  const drawDotPlot = () => {
     getYScale();
     getYAxis();
     initYaxisBar(
@@ -56718,8 +56927,8 @@ const ClevelandDotPlot = ({
       onDataLabelCoordinatesChange,
       yScale,
       columnWidth,
-      false,
       isReportEditable,
+      false,
       barChart
     );
     getConnectors();
@@ -56957,11 +57166,11 @@ const ClevelandDotPlot = ({
 export {
   AreaChart,
   BubbleChart,
-  ClevelandDotPlot,
   ColumnChart,
   ColumnHistogramChart,
   CustomColumnChart,
   DonutChart,
+  DotPlot,
   HorizontalBarChart,
   HorizontalHistogramChart,
   LayeredColumnChart,