@pie-lib/graphing-module 2.2.1 → 2.4.0

package/module/index.js

@@ -1,7 +1,7 @@
-import {_dll_prop_types, _dll_lodash, _dll_pie_lib__render_ui, _dll_material_ui__core_styles, _dll_react, _dll_classnames, _dll_react_dom, _dll_debug, _dll_material_ui__core, _dll_material_ui__core_styles_color_manipulator, _dll_material_ui__icons} from "../../shared-module@^1.11.1/module/index.js";
-import {_dll_pie_lib__editable_html} from "../../editable-html-module@^5.3.1/module/index.js";
-import {_dll_pie_lib__drag} from "../../drag-module@^2.5.1/module/index.js";
-import {_dll_pie_lib__config_ui} from "../../config-module@^2.16.1/module/index.js";
+import {_dll_prop_types, _dll_lodash, _dll_pie_lib__render_ui, _dll_material_ui__core_styles, _dll_react, _dll_classnames, _dll_react_dom, _dll_debug, _dll_material_ui__core, _dll_material_ui__core_styles_color_manipulator, _dll_material_ui__icons} from "../../shared-module@^1.13.0/module/index.js";
+import {_dll_pie_lib__editable_html} from "../../editable-html-module@^5.5.0/module/index.js";
+import {_dll_pie_lib__drag} from "../../drag-module@^2.7.0/module/index.js";
+import {_dll_pie_lib__config_ui} from "../../config-module@^2.18.0/module/index.js";
 var xhtml = "http://www.w3.org/1999/xhtml";
 var namespaces = {
   svg: "http://www.w3.org/2000/svg",
@@ -737,6 +737,9 @@ var types = Object.freeze({
   GraphPropsType: GraphPropsType
 });
 var commonjsGlobal$1 = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
+function getDefaultExportFromCjs(x) {
+  return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
+}
 var invariant = function (condition, format, a, b, c, d, e, f) {
   {
     if (format === undefined) {
@@ -3017,11 +3020,11 @@ class LocalDraggable extends Draggable {
 }
 const React$J = _dll_react;
 const PropTypes$E = _dll_prop_types;
-const debug$c = _dll_debug;
+const debug$d = _dll_debug;
 const {isFunction: isFunction$1} = _dll_lodash;
 const _jsxFileName$A = "/Users/carlacostea/Pie_Work/pie-framework/pie-lib/packages/plot/src/grid-draggable.jsx";
 var _class$1;
-const log$c = debug$c('pie-lib:plot:grid-draggable');
+const log$d = debug$d('pie-lib:plot:grid-draggable');
 const deltaFn = (scale, snap, val) => delta => {
   const normalized = delta + scale(0);
   const inverted = scale.invert(normalized);
@@ -3103,14 +3106,14 @@ const gridDraggable = opts => Comp => {
         const start = this.state[`start${K}`];
         const delta = Math.abs(end - start);
         const out = delta < Math.abs(this.grid()[key]) / 10;
-        log$c('[tiny] key: ', key, 'delta: ', delta, 'out: ', out);
+        log$d('[tiny] key: ', key, 'delta: ', delta, 'out: ', out);
         return out;
       };
     }
     __init5() {
       this.getScaledBounds = () => {
         const bounds = opts.bounds(this.props, this.props.graphProps);
-        log$c('bounds: ', bounds);
+        log$d('bounds: ', bounds);
         const grid = this.grid();
         const scaled = {
           left: bounds.left / grid.interval * grid.x,
@@ -3118,7 +3121,7 @@ const gridDraggable = opts => Comp => {
           top: bounds.top / grid.interval * grid.y,
           bottom: bounds.bottom / grid.interval * grid.y
         };
-        log$c('[getScaledBounds]: ', scaled);
+        log$d('[getScaledBounds]: ', scaled);
         return scaled;
       };
     }
@@ -3213,22 +3216,22 @@ const gridDraggable = opts => Comp => {
     __init10() {
       this.applyDelta = point => {
         const delta = this.getDelta(point);
-        log$c('[applyDelta] delta:', delta);
+        log$d('[applyDelta] delta:', delta);
         return opts.fromDelta(this.props, delta);
       };
     }
     __init11() {
       this.onStop = (e, dd) => {
-        log$c('[onStop] dd:', dd);
+        log$d('[onStop] dd:', dd);
         const {onDragStop, onClick} = this.props;
         if (onDragStop) {
           onDragStop();
         }
-        log$c('[onStop] lastX/Y: ', dd.lastX, dd.lastY);
+        log$d('[onStop] lastX/Y: ', dd.lastX, dd.lastY);
         const isClick = this.tiny('x', e) && this.tiny('y', e);
         if (isClick) {
           if (onClick) {
-            log$c('call onClick');
+            log$d('call onClick');
             this.setState({
               startX: null
             });
@@ -3284,14 +3287,14 @@ const gridDraggable = opts => Comp => {
     }
   }, _class$1.__initStatic(), _class$1);
 };
-const debug$b = _dll_debug;
-const log$b = debug$b('pie-lib:plot:trig');
+const debug$c = _dll_debug;
+const log$c = debug$c('pie-lib:plot:trig');
 const toDegrees = radians => radians * (180 / Math.PI);
 const toRadians = degrees => degrees * (Math.PI / 180);
 const angle = (a, b) => {
   const vd = b.y - a.y;
   const hd = b.x - a.x;
-  log$b(a, b, 'vd: ', vd, 'hd: ', hd);
+  log$c(a, b, 'vd: ', vd, 'hd: ', hd);
   const radians = Math.atan2(vd, hd);
   return radians < 0 ? radians + Math.PI * 2 : radians;
 };
@@ -3299,7 +3302,7 @@ const NINETY = Math.PI / 2;
 const ONE_EIGHTY = Math.PI;
 const TWO_SEVENTY = ONE_EIGHTY + NINETY;
 const acuteXAngle = a => {
-  log$b(toDegrees(a));
+  log$c(toDegrees(a));
   if (a < NINETY) {
     return a;
   }
@@ -3326,7 +3329,7 @@ const edges = (domain, range) => (a, b) => {
   return [aToB, bToA];
 };
 const getOpposingSide = (hyp, angle) => {
-  log$b('[getOpposingSide] hyp: ', hyp, 'angle:', angle);
+  log$c('[getOpposingSide] hyp: ', hyp, 'angle:', angle);
   return Math.abs(hyp * Math.sin(angle));
 };
 const getShortestSide = (xh, yh) => {
@@ -3354,7 +3357,7 @@ const getShortestSide = (xh, yh) => {
   console.warn('hypotenuse - which is shorter? x:', xh, 'y:', yh);
 };
 const diffEdge = (bounds, a, b) => {
-  let l = log$b.enabled ? log$b.bind(log$b, `diffEdge: [${a.x},${a.y} -> ${b.x},${b.y}]`) : () => {};
+  let l = log$c.enabled ? log$c.bind(log$c, `diffEdge: [${a.x},${a.y} -> ${b.x},${b.y}]`) : () => {};
   const xRadians = angle(a, b);
   l('x angle', toDegrees(xRadians));
   const yRadians = Math.abs(xRadians - toRadians(90));
@@ -4520,14 +4523,14 @@ Linear.prototype = {
 function curveLinear(context) {
   return new Linear(context);
 }
-function x$1(p) {
+function x(p) {
   return p[0];
 }
 function y(p) {
   return p[1];
 }
 function line() {
-  var x = x$1, y$1 = y, defined = constant(true), context = null, curve = curveLinear, output = null;
+  var x$1 = x, y$1 = y, defined = constant(true), context = null, curve = curveLinear, output = null;
   function line(data) {
     var i, n = data.length, d, defined0 = false, buffer;
     if (context == null) output = curve(buffer = path());
@@ -4535,12 +4538,12 @@ function line() {
       if (!(i < n && defined(d = data[i], i, data)) === defined0) {
         if (defined0 = !defined0) output.lineStart(); else output.lineEnd();
       }
-      if (defined0) output.point(+x(d, i, data), +y$1(d, i, data));
+      if (defined0) output.point(+x$1(d, i, data), +y$1(d, i, data));
     }
     if (buffer) return (output = null, buffer + "" || null);
   }
   line.x = function (_) {
-    return arguments.length ? (x = typeof _ === "function" ? _ : constant(+_), line) : x;
+    return arguments.length ? (x$1 = typeof _ === "function" ? _ : constant(+_), line) : x$1;
   };
   line.y = function (_) {
     return arguments.length ? (y$1 = typeof _ === "function" ? _ : constant(+_), line) : y$1;
@@ -8193,9 +8196,9 @@ const React$x = _dll_react;
 const PropTypes$s = _dll_prop_types;
 const {isEqual: isEqual$4} = _dll_lodash;
 const {cloneDeep: cloneDeep$1} = _dll_lodash;
-const debug$a = _dll_debug;
+const debug$b = _dll_debug;
 const _jsxFileName$u = "/Users/carlacostea/Pie_Work/pie-framework/pie-lib/packages/graphing/src/graph.jsx";
-const log$a = debug$a('pie-lib:graphing:graph');
+const log$b = debug$b('pie-lib:graphing:graph');
 const graphPropTypes = {
   axesSettings: PropTypes$s.shape(AxisPropTypes),
   backgroundMarks: PropTypes$s.array,
@@ -8330,7 +8333,7 @@ class Graph extends React$x.Component {
       if (labelModeEnabled || !currentTool || [null, undefined].includes(x) || [null, undefined].includes(y)) {
         return;
       }
-      log$a('[onBgClick] x,y: ', x, y);
+      log$b('[onBgClick] x,y: ', x, y);
       const buildingMark = marks.filter(m => m.building)[0];
       let updatedMark;
       if (buildingMark && currentTool && buildingMark.type === currentTool.type) {
@@ -9040,7 +9043,7 @@ var $$observable = (function () {
 var randomString = function randomString() {
   return Math.random().toString(36).substring(7).split('').join('.');
 };
-var ActionTypes = {
+var ActionTypes$1 = {
   INIT: "@@redux/INIT" + randomString(),
   REPLACE: "@@redux/REPLACE" + randomString(),
   PROBE_UNKNOWN_ACTION: function PROBE_UNKNOWN_ACTION() {
@@ -9188,7 +9191,7 @@ function createStore(reducer, preloadedState, enhancer) {
     }
     currentReducer = nextReducer;
     dispatch({
-      type: ActionTypes.REPLACE
+      type: ActionTypes$1.REPLACE
     });
   }
   function observable() {
@@ -9215,7 +9218,7 @@ function createStore(reducer, preloadedState, enhancer) {
     }, _ref);
   }
   dispatch({
-    type: ActionTypes.INIT
+    type: ActionTypes$1.INIT
   });
   return (_ref2 = {
     dispatch: dispatch,
@@ -9234,7 +9237,7 @@ function warning$1(message) {
 }
 function getUnexpectedStateShapeWarningMessage(inputState, reducers, action, unexpectedKeyCache) {
   var reducerKeys = Object.keys(reducers);
-  var argumentName = action && action.type === ActionTypes.INIT ? 'preloadedState argument passed to createStore' : 'previous state received by the reducer';
+  var argumentName = action && action.type === ActionTypes$1.INIT ? 'preloadedState argument passed to createStore' : 'previous state received by the reducer';
   if (reducerKeys.length === 0) {
     return 'Store does not have a valid reducer. Make sure the argument passed ' + 'to combineReducers is an object whose values are reducers.';
   }
@@ -9247,7 +9250,7 @@ function getUnexpectedStateShapeWarningMessage(inputState, reducers, action, une
   unexpectedKeys.forEach(function (key) {
     unexpectedKeyCache[key] = true;
   });
-  if (action && action.type === ActionTypes.REPLACE) return;
+  if (action && action.type === ActionTypes$1.REPLACE) return;
   if (unexpectedKeys.length > 0) {
     return "Unexpected " + (unexpectedKeys.length > 1 ? 'keys' : 'key') + " " + ("\"" + unexpectedKeys.join('", "') + "\" found in " + argumentName + ". ") + "Expected to find one of the known reducer keys instead: " + ("\"" + reducerKeys.join('", "') + "\". Unexpected keys will be ignored.");
   }
@@ -9256,15 +9259,15 @@ function assertReducerShape(reducers) {
   Object.keys(reducers).forEach(function (key) {
     var reducer = reducers[key];
     var initialState = reducer(undefined, {
-      type: ActionTypes.INIT
+      type: ActionTypes$1.INIT
     });
     if (typeof initialState === 'undefined') {
       throw new Error("The slice reducer for key \"" + key + "\" returned undefined during initialization. " + "If the state passed to the reducer is undefined, you must " + "explicitly return the initial state. The initial state may " + "not be undefined. If you don't want to set a value for this reducer, " + "you can use null instead of undefined.");
     }
     if (typeof reducer(undefined, {
-      type: ActionTypes.PROBE_UNKNOWN_ACTION()
+      type: ActionTypes$1.PROBE_UNKNOWN_ACTION()
     }) === 'undefined') {
-      throw new Error("The slice reducer for key \"" + key + "\" returned undefined when probed with a random type. " + ("Don't try to handle '" + ActionTypes.INIT + "' or other actions in \"redux/*\" ") + "namespace. They are considered private. Instead, you must return the " + "current state for any unknown actions, unless it is undefined, " + "in which case you must return the initial state, regardless of the " + "action type. The initial state may not be undefined, but can be null.");
+      throw new Error("The slice reducer for key \"" + key + "\" returned undefined when probed with a random type. " + ("Don't try to handle '" + ActionTypes$1.INIT + "' or other actions in \"redux/*\" ") + "namespace. They are considered private. Instead, you must return the " + "current state for any unknown actions, unless it is undefined, " + "in which case you must return the initial state, regardless of the " + "action type. The initial state may not be undefined, but can be null.");
     }
   });
 }
@@ -9638,73 +9641,152 @@ const marks = (state = [], action) => {
       return state;
   }
 };
-const c = {
-  UNDO: "@@redux-undo/UNDO",
-  REDO: "@@redux-undo/REDO",
-  JUMP_TO_FUTURE: "@@redux-undo/JUMP_TO_FUTURE",
-  JUMP_TO_PAST: "@@redux-undo/JUMP_TO_PAST",
-  JUMP: "@@redux-undo/JUMP",
-  CLEAR_HISTORY: "@@redux-undo/CLEAR_HISTORY"
-}, M = {
-  undo() {
+var lib = {};
+var actions = {};
+Object.defineProperty(actions, "__esModule", {
+  value: true
+});
+var ActionTypes = actions.ActionTypes = {
+  UNDO: '@@redux-undo/UNDO',
+  REDO: '@@redux-undo/REDO',
+  JUMP_TO_FUTURE: '@@redux-undo/JUMP_TO_FUTURE',
+  JUMP_TO_PAST: '@@redux-undo/JUMP_TO_PAST',
+  JUMP: '@@redux-undo/JUMP',
+  CLEAR_HISTORY: '@@redux-undo/CLEAR_HISTORY'
+};
+actions.ActionCreators = {
+  undo: function undo() {
     return {
-      type: c.UNDO
+      type: ActionTypes.UNDO
     };
   },
-  redo() {
+  redo: function redo() {
     return {
-      type: c.REDO
+      type: ActionTypes.REDO
     };
   },
-  jumpToFuture(e) {
+  jumpToFuture: function jumpToFuture(index) {
     return {
-      type: c.JUMP_TO_FUTURE,
-      index: e
+      type: ActionTypes.JUMP_TO_FUTURE,
+      index: index
     };
   },
-  jumpToPast(e) {
+  jumpToPast: function jumpToPast(index) {
     return {
-      type: c.JUMP_TO_PAST,
-      index: e
+      type: ActionTypes.JUMP_TO_PAST,
+      index: index
     };
   },
-  jump(e) {
+  jump: function jump(index) {
     return {
-      type: c.JUMP,
-      index: e
+      type: ActionTypes.JUMP,
+      index: index
     };
   },
-  clearHistory() {
+  clearHistory: function clearHistory() {
     return {
-      type: c.CLEAR_HISTORY
+      type: ActionTypes.CLEAR_HISTORY
     };
   }
 };
-function U(e, t = []) {
-  return Array.isArray(e) ? e : typeof e == "string" ? [e] : t;
+var helpers = {};
+Object.defineProperty(helpers, "__esModule", {
+  value: true
+});
+helpers.parseActions = parseActions;
+helpers.isHistory = isHistory;
+helpers.distinctState = distinctState;
+helpers.includeAction = includeAction;
+helpers.excludeAction = excludeAction;
+helpers.combineFilters = combineFilters;
+helpers.groupByActionTypes = groupByActionTypes;
+helpers.newHistory = newHistory;
+function parseActions(rawActions) {
+  var defaultValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  if (Array.isArray(rawActions)) {
+    return rawActions;
+  } else if (typeof rawActions === 'string') {
+    return [rawActions];
+  }
+  return defaultValue;
+}
+function isHistory(history) {
+  return typeof history.present !== 'undefined' && typeof history.future !== 'undefined' && typeof history.past !== 'undefined' && Array.isArray(history.future) && Array.isArray(history.past);
+}
+function distinctState() {
+  console.warn('distinctState is deprecated in beta4 and newer. ' + 'The distinctState behavior is now default, which means only ' + 'actions resulting in a new state are recorded. ' + 'See https://github.com/omnidan/redux-undo#filtering-actions ' + 'for more details.');
+  return function () {
+    return true;
+  };
+}
+function includeAction(rawActions) {
+  var actions = parseActions(rawActions);
+  return function (action) {
+    return actions.indexOf(action.type) >= 0;
+  };
+}
+function excludeAction(rawActions) {
+  var actions = parseActions(rawActions);
+  return function (action) {
+    return actions.indexOf(action.type) < 0;
+  };
+}
+function combineFilters() {
+  for (var _len = arguments.length, filters = Array(_len), _key = 0; _key < _len; _key++) {
+    filters[_key] = arguments[_key];
+  }
+  return filters.reduce(function (prev, curr) {
+    return function (action, currentState, previousHistory) {
+      return prev(action, currentState, previousHistory) && curr(action, currentState, previousHistory);
+    };
+  }, function () {
+    return true;
+  });
 }
-function E(e) {
-  return typeof e.present < "u" && typeof e.future < "u" && typeof e.past < "u" && Array.isArray(e.future) && Array.isArray(e.past);
+function groupByActionTypes(rawActions) {
+  var actions = parseActions(rawActions);
+  return function (action) {
+    return actions.indexOf(action.type) >= 0 ? action.type : null;
+  };
 }
-function T(e, t, n, s = null) {
+function newHistory(past, present, future) {
+  var group = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
   return {
-    past: e,
-    present: t,
-    future: n,
-    group: s,
-    _latestUnfiltered: t,
-    index: e.length,
-    limit: e.length + n.length + 1
+    past: past,
+    present: present,
+    future: future,
+    group: group,
+    _latestUnfiltered: present,
+    index: past.length,
+    limit: past.length + future.length + 1
   };
 }
-let _$1, d;
-const P = {
-  prevState: "#9E9E9E",
-  action: "#03A9F4",
-  nextState: "#4CAF50"
+var reducer$1 = {
+  exports: {}
 };
-function F() {
-  d = {
+var debug$a = {};
+Object.defineProperty(debug$a, "__esModule", {
+  value: true
+});
+function _toConsumableArray(arr) {
+  if (Array.isArray(arr)) {
+    for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) {
+      arr2[i] = arr[i];
+    }
+    return arr2;
+  } else {
+    return Array.from(arr);
+  }
+}
+var __DEBUG__ = void 0;
+var displayBuffer = void 0;
+var colors = {
+  prevState: '#9E9E9E',
+  action: '#03A9F4',
+  nextState: '#4CAF50'
+};
+function initBuffer() {
+  displayBuffer = {
     header: [],
     prev: [],
     action: [],
@@ -9712,117 +9794,362 @@ function F() {
     msgs: []
   };
 }
-function H() {
-  const {header: e, prev: t, next: n, action: s, msgs: l} = d;
-  console.group ? (console.groupCollapsed(...e), console.log(...t), console.log(...s), console.log(...n), console.log(...l), console.groupEnd()) : (console.log(...e), console.log(...t), console.log(...s), console.log(...n), console.log(...l));
-}
-function S(e, t, n) {
-  return [`%c${e}`, `color: ${t}; font-weight: bold`, n];
-}
-function h(e, t) {
-  (F(), _$1 && (console.group ? (d.header = ["%credux-undo", "font-style: italic", "action", e.type], d.action = S("action", P.action, e), d.prev = S("prev history", P.prevState, t)) : (d.header = ["redux-undo action", e.type], d.action = ["action", e], d.prev = ["prev history", t])));
-}
-function a(e) {
-  _$1 && (console.group ? d.next = S("next history", P.nextState, e) : d.next = ["next history", e], H());
-}
-function f(...e) {
-  _$1 && (d.msgs = d.msgs.concat([...e, `
-`]));
-}
-function j(e) {
-  _$1 = e;
-}
-function m(e, t) {
-  const n = T([], e, []);
-  return (t && (n._latestUnfiltered = null), n);
-}
-function I(e, t, n, s) {
-  const l = e.past.length + 1;
-  (f("inserting", t), f("new free: ", n - l));
-  const {past: i, _latestUnfiltered: o} = e, p = n && n <= l, r = i.slice(p ? 1 : 0), u = o != null ? [...r, o] : r;
-  return T(u, t, [], s);
-}
-function A(e, t) {
-  if (t < 0 || t >= e.future.length) return e;
-  const {past: n, future: s, _latestUnfiltered: l} = e, i = [...n, l, ...s.slice(0, t)], o = s[t], p = s.slice(t + 1);
-  return T(i, o, p);
-}
-function x(e, t) {
-  if (t < 0 || t >= e.past.length) return e;
-  const {past: n, future: s, _latestUnfiltered: l} = e, i = n.slice(0, t), o = [...n.slice(t + 1), l, ...s], p = n[t];
-  return T(i, p, o);
-}
-function O(e, t) {
-  return t > 0 ? A(e, t - 1) : t < 0 ? x(e, e.past.length + t) : e;
-}
-function J(e, t) {
-  return t.indexOf(e) > -1 ? e : !e;
-}
-function C(e, t = {}) {
-  j(t.debug);
-  const n = {
-    limit: void 0,
-    filter: () => !0,
-    groupBy: () => null,
-    undoType: c.UNDO,
-    redoType: c.REDO,
-    jumpToPastType: c.JUMP_TO_PAST,
-    jumpToFutureType: c.JUMP_TO_FUTURE,
-    jumpType: c.JUMP,
-    neverSkipReducer: !1,
-    ignoreInitialState: !1,
-    syncFilter: !1,
-    ...t,
-    initTypes: U(t.initTypes, ["@@redux-undo/INIT"]),
-    clearHistoryType: U(t.clearHistoryType, [c.CLEAR_HISTORY])
-  }, s = n.neverSkipReducer ? (i, o, ...p) => ({
-    ...i,
-    present: e(i.present, o, ...p)
-  }) : i => i;
-  let l;
-  return (i = l, o = {}, ...p) => {
-    h(o, i);
-    let r = i;
-    if (!l) if ((f("history is uninitialized"), i === void 0)) {
-      const g = e(i, {
-        type: "@@redux-undo/CREATE_HISTORY"
-      }, ...p);
-      return (r = m(g, n.ignoreInitialState), f("do not set initialState on probe actions"), a(r), r);
-    } else E(i) ? (r = l = n.ignoreInitialState ? i : T(i.past, i.present, i.future), f("initialHistory initialized: initialState is a history", l)) : (r = l = m(i, n.ignoreInitialState), f("initialHistory initialized: initialState is not a history", l));
-    let u;
-    switch (o.type) {
-      case void 0:
-        return r;
-      case n.undoType:
-        return (u = O(r, -1), f("perform undo"), a(u), s(u, o, ...p));
-      case n.redoType:
-        return (u = O(r, 1), f("perform redo"), a(u), s(u, o, ...p));
-      case n.jumpToPastType:
-        return (u = x(r, o.index), f(`perform jumpToPast to ${o.index}`), a(u), s(u, o, ...p));
-      case n.jumpToFutureType:
-        return (u = A(r, o.index), f(`perform jumpToFuture to ${o.index}`), a(u), s(u, o, ...p));
-      case n.jumpType:
-        return (u = O(r, o.index), f(`perform jump to ${o.index}`), a(u), s(u, o, ...p));
-      case J(o.type, n.clearHistoryType):
-        return (u = m(r.present, n.ignoreInitialState), f("perform clearHistory"), a(u), s(u, o, ...p));
-      default:
-        if ((u = e(r.present, o, ...p), n.initTypes.some(y => y === o.type))) return (f("reset history due to init action"), a(l), l);
-        if (r._latestUnfiltered === u) return r;
-        if (typeof n.filter == "function" && !n.filter(o, u, r)) {
-          const y = T(r.past, u, r.future, r.group);
-          return (n.syncFilter || (y._latestUnfiltered = r._latestUnfiltered), f("filter ignored action, not storing it in past"), a(y), y);
+function printBuffer() {
+  var _displayBuffer = displayBuffer, header = _displayBuffer.header, prev = _displayBuffer.prev, next = _displayBuffer.next, action = _displayBuffer.action, msgs = _displayBuffer.msgs;
+  if (console.group) {
+    var _console, _console2, _console3, _console4, _console5;
+    (_console = console).groupCollapsed.apply(_console, _toConsumableArray(header));
+    (_console2 = console).log.apply(_console2, _toConsumableArray(prev));
+    (_console3 = console).log.apply(_console3, _toConsumableArray(action));
+    (_console4 = console).log.apply(_console4, _toConsumableArray(next));
+    (_console5 = console).log.apply(_console5, _toConsumableArray(msgs));
+    console.groupEnd();
+  } else {
+    var _console6, _console7, _console8, _console9, _console10;
+    (_console6 = console).log.apply(_console6, _toConsumableArray(header));
+    (_console7 = console).log.apply(_console7, _toConsumableArray(prev));
+    (_console8 = console).log.apply(_console8, _toConsumableArray(action));
+    (_console9 = console).log.apply(_console9, _toConsumableArray(next));
+    (_console10 = console).log.apply(_console10, _toConsumableArray(msgs));
+  }
+}
+function colorFormat(text, color, obj) {
+  return ['%c' + text, 'color: ' + color + '; font-weight: bold', obj];
+}
+function start(action, state) {
+  initBuffer();
+  if (__DEBUG__) {
+    if (console.group) {
+      displayBuffer.header = ['%credux-undo', 'font-style: italic', 'action', action.type];
+      displayBuffer.action = colorFormat('action', colors.action, action);
+      displayBuffer.prev = colorFormat('prev history', colors.prevState, state);
+    } else {
+      displayBuffer.header = ['redux-undo action', action.type];
+      displayBuffer.action = ['action', action];
+      displayBuffer.prev = ['prev history', state];
+    }
+  }
+}
+function end(nextState) {
+  if (__DEBUG__) {
+    if (console.group) {
+      displayBuffer.next = colorFormat('next history', colors.nextState, nextState);
+    } else {
+      displayBuffer.next = ['next history', nextState];
+    }
+    printBuffer();
+  }
+}
+function log$a() {
+  if (__DEBUG__) {
+    for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+    displayBuffer.msgs = displayBuffer.msgs.concat([].concat(args, ['\n']));
+  }
+}
+function set(debug) {
+  __DEBUG__ = debug;
+}
+debug$a.set = set;
+debug$a.start = start;
+debug$a.end = end;
+debug$a.log = log$a;
+(function (module, exports) {
+  Object.defineProperty(exports, "__esModule", {
+    value: true
+  });
+  var _extends = Object.assign || (function (target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i];
+      for (var key in source) {
+        if (Object.prototype.hasOwnProperty.call(source, key)) {
+          target[key] = source[key];
         }
-        const g = n.groupBy(o, u, r);
-        if (g != null && g === r.group) {
-          const y = T(r.past, u, r.future, r.group);
-          return (f("groupBy grouped the action with the previous action"), a(y), y);
+      }
+    }
+    return target;
+  });
+  exports.default = undoable;
+  var _debug = debug$a;
+  var debug = _interopRequireWildcard(_debug);
+  var _actions = actions;
+  var _helpers = helpers;
+  function _interopRequireWildcard(obj) {
+    if (obj && obj.__esModule) {
+      return obj;
+    } else {
+      var newObj = {};
+      if (obj != null) {
+        for (var key in obj) {
+          if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key];
         }
-        return (r = I(r, u, n.limit, g), f("inserted new state into history"), a(r), r);
+      }
+      newObj.default = obj;
+      return newObj;
     }
-  };
-}
+  }
+  function _toConsumableArray(arr) {
+    if (Array.isArray(arr)) {
+      for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) {
+        arr2[i] = arr[i];
+      }
+      return arr2;
+    } else {
+      return Array.from(arr);
+    }
+  }
+  function createHistory(state, ignoreInitialState) {
+    var history = (0, _helpers.newHistory)([], state, []);
+    if (ignoreInitialState) {
+      history._latestUnfiltered = null;
+    }
+    return history;
+  }
+  function lengthWithoutFuture(history) {
+    return history.past.length + 1;
+  }
+  function insert(history, state, limit, group) {
+    debug.log('inserting', state);
+    debug.log('new free: ', limit - lengthWithoutFuture(history));
+    var past = history.past, _latestUnfiltered = history._latestUnfiltered;
+    var historyOverflow = limit && lengthWithoutFuture(history) >= limit;
+    var pastSliced = past.slice(historyOverflow ? 1 : 0);
+    var newPast = _latestUnfiltered != null ? [].concat(_toConsumableArray(pastSliced), [_latestUnfiltered]) : pastSliced;
+    return (0, _helpers.newHistory)(newPast, state, [], group);
+  }
+  function jumpToFuture(history, index) {
+    if (index < 0 || index >= history.future.length) return history;
+    var past = history.past, future = history.future, _latestUnfiltered = history._latestUnfiltered;
+    var newPast = [].concat(_toConsumableArray(past), [_latestUnfiltered], _toConsumableArray(future.slice(0, index)));
+    var newPresent = future[index];
+    var newFuture = future.slice(index + 1);
+    return (0, _helpers.newHistory)(newPast, newPresent, newFuture);
+  }
+  function jumpToPast(history, index) {
+    if (index < 0 || index >= history.past.length) return history;
+    var past = history.past, future = history.future, _latestUnfiltered = history._latestUnfiltered;
+    var newPast = past.slice(0, index);
+    var newFuture = [].concat(_toConsumableArray(past.slice(index + 1)), [_latestUnfiltered], _toConsumableArray(future));
+    var newPresent = past[index];
+    return (0, _helpers.newHistory)(newPast, newPresent, newFuture);
+  }
+  function jump(history, n) {
+    if (n > 0) return jumpToFuture(history, n - 1);
+    if (n < 0) return jumpToPast(history, history.past.length + n);
+    return history;
+  }
+  function actionTypeAmongClearHistoryType(actionType, clearHistoryType) {
+    return clearHistoryType.indexOf(actionType) > -1 ? actionType : !actionType;
+  }
+  function undoable(reducer) {
+    var rawConfig = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    debug.set(rawConfig.debug);
+    var config = {
+      initTypes: (0, _helpers.parseActions)(rawConfig.initTypes, ['@@redux-undo/INIT']),
+      limit: rawConfig.limit,
+      filter: rawConfig.filter || (function () {
+        return true;
+      }),
+      groupBy: rawConfig.groupBy || (function () {
+        return null;
+      }),
+      undoType: rawConfig.undoType || _actions.ActionTypes.UNDO,
+      redoType: rawConfig.redoType || _actions.ActionTypes.REDO,
+      jumpToPastType: rawConfig.jumpToPastType || _actions.ActionTypes.JUMP_TO_PAST,
+      jumpToFutureType: rawConfig.jumpToFutureType || _actions.ActionTypes.JUMP_TO_FUTURE,
+      jumpType: rawConfig.jumpType || _actions.ActionTypes.JUMP,
+      clearHistoryType: Array.isArray(rawConfig.clearHistoryType) ? rawConfig.clearHistoryType : [rawConfig.clearHistoryType || _actions.ActionTypes.CLEAR_HISTORY],
+      neverSkipReducer: rawConfig.neverSkipReducer || false,
+      ignoreInitialState: rawConfig.ignoreInitialState || false,
+      syncFilter: rawConfig.syncFilter || false
+    };
+    var initialState = config.history;
+    return function () {
+      for (var _len = arguments.length, slices = Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
+        slices[_key - 2] = arguments[_key];
+      }
+      var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
+      var action = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      debug.start(action, state);
+      var history = state;
+      if (!initialState) {
+        debug.log('history is uninitialized');
+        if (state === undefined) {
+          var clearHistoryAction = {
+            type: _actions.ActionTypes.CLEAR_HISTORY
+          };
+          var start = reducer.apply(undefined, [state, clearHistoryAction].concat(slices));
+          history = createHistory(start, config.ignoreInitialState);
+          debug.log('do not set initialState on probe actions');
+        } else if ((0, _helpers.isHistory)(state)) {
+          history = initialState = config.ignoreInitialState ? state : (0, _helpers.newHistory)(state.past, state.present, state.future);
+          debug.log('initialHistory initialized: initialState is a history', initialState);
+        } else {
+          history = initialState = createHistory(state, config.ignoreInitialState);
+          debug.log('initialHistory initialized: initialState is not a history', initialState);
+        }
+      }
+      var skipReducer = function skipReducer(res) {
+        return config.neverSkipReducer ? _extends({}, res, {
+          present: reducer.apply(undefined, [res.present, action].concat(slices))
+        }) : res;
+      };
+      var res = void 0;
+      switch (action.type) {
+        case undefined:
+          return history;
+        case config.undoType:
+          res = jump(history, -1);
+          debug.log('perform undo');
+          debug.end(res);
+          return skipReducer(res);
+        case config.redoType:
+          res = jump(history, 1);
+          debug.log('perform redo');
+          debug.end(res);
+          return skipReducer(res);
+        case config.jumpToPastType:
+          res = jumpToPast(history, action.index);
+          debug.log('perform jumpToPast to ' + action.index);
+          debug.end(res);
+          return skipReducer(res);
+        case config.jumpToFutureType:
+          res = jumpToFuture(history, action.index);
+          debug.log('perform jumpToFuture to ' + action.index);
+          debug.end(res);
+          return skipReducer(res);
+        case config.jumpType:
+          res = jump(history, action.index);
+          debug.log('perform jump to ' + action.index);
+          debug.end(res);
+          return skipReducer(res);
+        case actionTypeAmongClearHistoryType(action.type, config.clearHistoryType):
+          res = createHistory(history.present);
+          debug.log('perform clearHistory');
+          debug.end(res);
+          return skipReducer(res);
+        default:
+          res = reducer.apply(undefined, [history.present, action].concat(slices));
+          if (config.initTypes.some(function (actionType) {
+            return actionType === action.type;
+          })) {
+            debug.log('reset history due to init action');
+            debug.end(initialState);
+            return initialState;
+          }
+          if (history._latestUnfiltered === res) {
+            return history;
+          }
+          var filtered = typeof config.filter === 'function' && !config.filter(action, res, history);
+          var group = config.groupBy(action, res, history);
+          if (filtered) {
+            var filteredState = (0, _helpers.newHistory)(history.past, res, history.future, history.group);
+            if (!config.syncFilter) {
+              filteredState._latestUnfiltered = history._latestUnfiltered;
+            }
+            debug.log('filter ignored action, not storing it in past');
+            debug.end(filteredState);
+            return filteredState;
+          } else if (group != null && group === history.group) {
+            var groupedState = (0, _helpers.newHistory)(history.past, res, history.future, history.group);
+            debug.log('groupBy grouped the action with the previous action');
+            debug.end(groupedState);
+            return groupedState;
+          } else {
+            history = insert(history, res, config.limit, group);
+            debug.log('inserted new state into history');
+            debug.end(history);
+            return history;
+          }
+      }
+    };
+  }
+  module.exports = exports['default'];
+})(reducer$1, reducer$1.exports);
+getDefaultExportFromCjs(reducer$1.exports);
+(function (exports) {
+  Object.defineProperty(exports, "__esModule", {
+    value: true
+  });
+  var _actions = actions;
+  Object.defineProperty(exports, 'ActionTypes', {
+    enumerable: true,
+    get: function get() {
+      return _actions.ActionTypes;
+    }
+  });
+  Object.defineProperty(exports, 'ActionCreators', {
+    enumerable: true,
+    get: function get() {
+      return _actions.ActionCreators;
+    }
+  });
+  var _helpers = helpers;
+  Object.defineProperty(exports, 'parseActions', {
+    enumerable: true,
+    get: function get() {
+      return _helpers.parseActions;
+    }
+  });
+  Object.defineProperty(exports, 'isHistory', {
+    enumerable: true,
+    get: function get() {
+      return _helpers.isHistory;
+    }
+  });
+  Object.defineProperty(exports, 'distinctState', {
+    enumerable: true,
+    get: function get() {
+      return _helpers.distinctState;
+    }
+  });
+  Object.defineProperty(exports, 'includeAction', {
+    enumerable: true,
+    get: function get() {
+      return _helpers.includeAction;
+    }
+  });
+  Object.defineProperty(exports, 'excludeAction', {
+    enumerable: true,
+    get: function get() {
+      return _helpers.excludeAction;
+    }
+  });
+  Object.defineProperty(exports, 'combineFilters', {
+    enumerable: true,
+    get: function get() {
+      return _helpers.combineFilters;
+    }
+  });
+  Object.defineProperty(exports, 'groupByActionTypes', {
+    enumerable: true,
+    get: function get() {
+      return _helpers.groupByActionTypes;
+    }
+  });
+  Object.defineProperty(exports, 'newHistory', {
+    enumerable: true,
+    get: function get() {
+      return _helpers.newHistory;
+    }
+  });
+  var _reducer = reducer$1.exports;
+  Object.defineProperty(exports, 'default', {
+    enumerable: true,
+    get: function get() {
+      return _interopRequireDefault(_reducer).default;
+    }
+  });
+  function _interopRequireDefault(obj) {
+    return obj && obj.__esModule ? obj : {
+      default: obj
+    };
+  }
+})(lib);
+var undoable = getDefaultExportFromCjs(lib);
 var reducer = () => combineReducers({
-  marks: C(marks, {
+  marks: undoable(marks, {
     debug: false
   })
 });
@@ -17360,8 +17687,8 @@ const mapStateToProps = s => ({
 });
 const mapDispatchToProps = dispatch => ({
   onChangeMarks: m => dispatch(changeMarks(m)),
-  onUndo: () => dispatch(M.undo()),
-  onRedo: () => dispatch(M.redo()),
+  onUndo: () => dispatch(lib.ActionCreators.undo()),
+  onRedo: () => dispatch(lib.ActionCreators.redo()),
   onReset: () => dispatch(changeMarks([]))
 });
 const GraphContainer = connect(mapStateToProps, mapDispatchToProps)(GraphWithControls$1);

package/module/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "@pie-lib/graphing-module",
-  "version": "2.2.1",
+  "version": "2.4.0",
   "mappings": {
     "@pie-lib/plot": "_dll_pie_lib__plot",
     "@pie-lib/graphing": "_dll_pie_lib__graphing"
@@ -8,30 +8,30 @@
   "versionInfo": {
     "data": {
       "@pie-lib/plot": {
-        "version": "2.19.0"
+        "version": "2.22.0"
       },
       "@pie-lib/graphing": {
-        "version": "2.26.0"
+        "version": "2.29.0"
       }
     },
-    "hash": "0d55439cc5ee5fc43715b495c37baa993eded44e"
+    "hash": "42916a51d373b14cf40d3b206d9707029ea56acc"
   },
   "modules": [
     {
       "name": "@pie-lib/shared-module",
-      "version": "^1.11.1"
+      "version": "^1.13.0"
     },
     {
       "name": "@pie-lib/editable-html-module",
-      "version": "^5.3.1"
+      "version": "^5.5.0"
     },
     {
       "name": "@pie-lib/drag-module",
-      "version": "^2.5.1"
+      "version": "^2.7.0"
     },
     {
       "name": "@pie-lib/config-module",
-      "version": "^2.16.1"
+      "version": "^2.18.0"
     }
   ],
   "isLocal": true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pie-lib/graphing-module",
-  "version": "2.2.1",
+  "version": "2.4.0",
   "module": "module/index.js",
   "repository": "pie-framework/pie-lib",
   "publishConfig": {