npm - @atlaskit/editor-core - Versions diffs - 98.10.5 → 98.11.0 - Mend

@atlaskit/editor-core 98.10.5 → 98.11.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (33) hide show

package/dist/es2015/utils/getAttrsWithChangesRecorder.d.ts ADDED Viewed

@@ -0,0 +1,23 @@
+import { Node } from 'prosemirror-model';
+export interface GetAttrsChange<T, V> {
+    node: Node;
+    prevAttrs?: T;
+    newAttrs: T | false | undefined;
+    options: V;
+}
+export declare type GetAttrsWithChangesRecorder<T, V> = {
+    getAttrs(prevAttrs?: T | undefined, node?: Node): T | false | undefined;
+    getAndResetAttrsChanges(): GetAttrsChange<T, V>[];
+};
+/**
+ * Create a new getAttrs handler who will wrap the original function,
+ * and store the changes internally to be used for other
+ * tools like Analytics later in the code.
+ *
+ * @param getAttrs - Function who gets the new attributes
+ * @return object
+ * @property handler - New handler to get indentation attributes (It wraps the original)
+ * @property getChanges - Return all the stored changes.
+ * @property clear - Clear the changes
+ */
+export default function getAttrsWithChangesRecorder<T, V>(getAttrs: (prevAttrs?: T, node?: Node) => T | false | undefined, options: V): GetAttrsWithChangesRecorder<T, V>;

package/dist/es2015/utils/getAttrsWithChangesRecorder.js ADDED Viewed

@@ -0,0 +1,33 @@
+/**
+ * Create a new getAttrs handler who will wrap the original function,
+ * and store the changes internally to be used for other
+ * tools like Analytics later in the code.
+ *
+ * @param getAttrs - Function who gets the new attributes
+ * @return object
+ * @property handler - New handler to get indentation attributes (It wraps the original)
+ * @property getChanges - Return all the stored changes.
+ * @property clear - Clear the changes
+ */
+export default function getAttrsWithChangesRecorder(getAttrs, options) {
+    var changes = [];
+    function getAttrsWithChangesRecorder(prevAttrs, node) {
+        var newAttrs = getAttrs(prevAttrs, node);
+        changes.push({
+            node: node,
+            prevAttrs: prevAttrs,
+            newAttrs: newAttrs,
+            options: options,
+        });
+        return newAttrs;
+    }
+    return {
+        getAttrs: getAttrsWithChangesRecorder,
+        getAndResetAttrsChanges: function () {
+            var oldChanges = changes;
+            changes = [];
+            return oldChanges;
+        },
+    };
+}
+//# sourceMappingURL=getAttrsWithChangesRecorder.js.map

package/dist/es2015/utils/getAttrsWithChangesRecorder.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"getAttrsWithChangesRecorder.js","sourceRoot":"","sources":["../../../src/utils/getAttrsWithChangesRecorder.ts"],"names":[],"mappings":"AAcA;;;;;;;;;;GAUG;AACH,MAAM,CAAC,OAAO,UAAU,2BAA2B,CACjD,QAA+D,EAC/D,OAAU;IAEV,IAAI,OAAO,GAA2B,EAAE,CAAC;IAEzC,SAAS,2BAA2B,CAClC,SAAa,EACb,IAAW;QAEX,IAAM,QAAQ,GAAG,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAE3C,OAAO,CAAC,IAAI,CAAC;YACX,IAAI,EAAE,IAAK;YACX,SAAS,WAAA;YACT,QAAQ,UAAA;YACR,OAAO,SAAA;SACR,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,OAAO;QACL,QAAQ,EAAE,2BAA2B;QACrC,uBAAuB;YACrB,IAAM,UAAU,GAAG,OAAO,CAAC;YAC3B,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,UAAU,CAAC;QACpB,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/es5/commands/index.d.ts CHANGED Viewed

@@ -20,4 +20,4 @@ export declare const changeImageAlignment: (align: any) => Command;
  * return `undefined for no-op.
  * return an `object` to update the mark.
  */
-export declare const toggleBlockMark: <T = object>(markType: MarkType<any>, getAttrs: (prevAttrs?: T | undefined) => false | T | undefined, allowedBlocks?: NodeType<any>[] | ((schema: Schema<any, any>, node: PMNode<any>, parent: PMNode<any>) => boolean) | undefined) => Command;
+export declare const toggleBlockMark: <T = object>(markType: MarkType<any>, getAttrs: (prevAttrs?: T | undefined, node?: PMNode<any> | undefined) => false | T | undefined, allowedBlocks?: NodeType<any>[] | ((schema: Schema<any, any>, node: PMNode<any>, parent: PMNode<any>) => boolean) | undefined) => Command;

package/dist/es5/commands/index.js CHANGED Viewed

@@ -185,7 +185,8 @@ exports.toggleBlockMark = function (markType, getAttrs, allowedBlocks) { return
                 : allowedBlocks(state.schema, node, parent))) &&
             parent.type.allowsMarkType(markType)) {
             var oldMarks = node.marks.filter(function (mark) { return mark.type === markType; });
-            var newAttrs = getAttrs(oldMarks.length ? oldMarks[0].attrs : undefined);
+            var prevAttrs = oldMarks.length ? oldMarks[0].attrs : undefined;
+            var newAttrs = getAttrs(prevAttrs, node);
             if (newAttrs !== undefined) {
                 tr.setNodeMarkup(pos, node.type, node.attrs, node.marks
                     .filter(function (mark) { return !markType.excludes(mark.type); })

package/dist/es5/commands/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/index.ts"],"names":[],"mappings":"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~~QAAoD~~,~~EACpD~~,aAE+D,IACnD,OAAA,UAAC,KAAK,EAAE,QAAQ;IACtB,IAAA,oBAA8B,EAA5B,cAAI,EAAE,UAAsB,CAAC;IAErC,IAAI,WAAW,GAAG,KAAK,CAAC;IACxB,IAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;IAEpB,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,UAAC,IAAI,EAAE,GAAG,EAAE,MAAM;QACjD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACtB,OAAO,KAAK,CAAC;SACd;QAED,IACE,CAAC,CAAC,aAAa;YACb,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC;gBAC3B,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACvC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;YACjD,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,EACpC;YACA,IAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAtB,CAAsB,CAAC,CAAC;~~YACnE~~,IAAM,~~QAAQ~~,GAAG,QAAQ,~~CACvB,QAAQ,~~CAAC,MAAM,CAAC,CAAC,CAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAW,CAAC,CAAC,CAAC,SAAS,~~CACvD~~,CAAC;~~YAEF~~,IAAI,QAAQ,KAAK,SAAS,EAAE;gBAC1B,EAAE,CAAC,aAAa,CACd,GAAG,EACH,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,KAAK,EACV,IAAI,CAAC,KAAK;qBACP,MAAM,CAAC,UAAA,IAAI,IAAI,OAAA,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAA7B,CAA6B,CAAC;qBAC7C,MAAM,CAAC,QAAQ,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAC/D,CAAC;gBACF,WAAW,GAAG,IAAI,CAAC;aACpB;SACF;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,WAAW,IAAI,EAAE,CAAC,UAAU,EAAE;QAChC,IAAI,QAAQ,EAAE;YACZ,QAAQ,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,CAAC;SAC/B;QACD,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AACf,CAAC,EA7Ca,CA6Cb,CAAC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/index.ts"],"names":[],"mappings":"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"}

package/dist/es5/plugins/code-block/ide-ux/commands.js CHANGED Viewed

@@ -3,14 +3,40 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var prosemirror_state_1 = require("prosemirror-state");
 var line_handling_1 = require("./line-handling");
 var analytics_1 = require("../../../analytics");
+var analytics_2 = require("../../analytics");
+/**
+ * Return the current indentation level
+ * @param indentText - Text in the code block that represent an indentation
+ * @param indentSize - Size of the indentation token in a string
+ */
+function getIndentLevel(indentText, indentSize) {
+    if (indentSize === 0 || indentText.length === 0) {
+        return 0;
+    }
+    return indentText.length / indentSize;
+}
 function indent(state, dispatch) {
     var _a = line_handling_1.getLinesFromSelection(state), text = _a.text, start = _a.start;
     var tr = state.tr, selection = state.selection;
     line_handling_1.forEachLine(text, function (line, offset) {
         var _a = line_handling_1.getLineInfo(line), indentText = _a.indentText, indentToken = _a.indentToken;
+        var indentLevel = getIndentLevel(indentText, indentToken.size);
         var indentToAdd = indentToken.token.repeat(indentToken.size - (indentText.length % indentToken.size) ||
             indentToken.size);
         tr.insertText(indentToAdd, tr.mapping.map(start + offset, -1));
+        analytics_2.addAnalytics(tr, {
+            action: "formatted" /* FORMATTED */,
+            actionSubject: "text" /* TEXT */,
+            actionSubjectId: "indentation" /* FORMAT_INDENT */,
+            eventType: "track" /* TRACK */,
+            attributes: {
+                inputMethod: "keyboard" /* KEYBOARD */,
+                previousIndentationLevel: indentLevel,
+                newIndentLevel: indentLevel + 1,
+                direction: "indent" /* INDENT */,
+                indentType: "codeBlock" /* CODE_BLOCK */,
+            },
+        });
         if (!selection.empty) {
             tr.setSelection(prosemirror_state_1.TextSelection.create(tr.doc, tr.mapping.map(selection.from, -1), tr.selection.to));
         }
@@ -26,8 +52,22 @@ function outdent(state, dispatch) {
     line_handling_1.forEachLine(text, function (line, offset) {
         var _a = line_handling_1.getLineInfo(line), indentText = _a.indentText, indentToken = _a.indentToken;
         if (indentText) {
+            var indentLevel = getIndentLevel(indentText, indentToken.size);
             var unindentLength = indentText.length % indentToken.size || indentToken.size;
             tr.delete(tr.mapping.map(start + offset), tr.mapping.map(start + offset + unindentLength));
+            analytics_2.addAnalytics(tr, {
+                action: "formatted" /* FORMATTED */,
+                actionSubject: "text" /* TEXT */,
+                actionSubjectId: "indentation" /* FORMAT_INDENT */,
+                eventType: "track" /* TRACK */,
+                attributes: {
+                    inputMethod: "keyboard" /* KEYBOARD */,
+                    previousIndentationLevel: indentLevel,
+                    newIndentLevel: indentLevel - 1,
+                    direction: "outdent" /* OUTDENT */,
+                    indentType: "codeBlock" /* CODE_BLOCK */,
+                },
+            });
         }
     });
     dispatch(tr);

package/dist/es5/plugins/code-block/ide-ux/commands.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../../../src/plugins/code-block/ide-ux/commands.ts"],"names":[],"mappings":";;AAAA,uDAA+D;AAE/D,iDAKyB;AACzB,gDAAsD;~~AAEtD~~,SAAgB,MAAM,CAAC,KAAkB,EAAE,QAAQ;IAC3C,IAAA,iDAA8C,EAA5C,cAAI,EAAE,gBAAsC,CAAC;IAC7C,IAAA,aAAE,EAAE,2BAAS,CAAW;IAChC,2BAAW,CAAC,IAAI,EAAE,UAAC,IAAI,EAAE,MAAM;QACvB,IAAA,sCAA+C,EAA7C,0BAAU,EAAE,4BAAiC,CAAC;QACtD,IAAM,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,MAAM,CAC1C,WAAW,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC;YACvD,WAAW,CAAC,IAAI,CACnB,CAAC;QACF,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;~~QAC~~/D,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE;YACpB,EAAE,CAAC,YAAY,CACb,iCAAa,CAAC,MAAM,CAClB,EAAE,CAAC,GAAG,EACN,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAClC,EAAE,CAAC,SAAS,CAAC,EAAE,CAChB,CACF,CAAC;SACH;IACH,CAAC,CAAC,CAAC;IACH,QAAQ,CAAC,EAAE,CAAC,CAAC;IACb,4BAAgB,CAAC,UAAU,CAAC,mCAAmC,CAAC,CAAC;IACjE,OAAO,IAAI,CAAC;AACd,CAAC;~~AAvBD~~,~~wBAuBC~~;AAED,SAAgB,OAAO,CAAC,KAAkB,EAAE,QAAQ;IAC5C,IAAA,iDAA8C,EAA5C,cAAI,EAAE,gBAAsC,CAAC;IAC7C,IAAA,aAAE,CAAW;IACrB,2BAAW,CAAC,IAAI,EAAE,UAAC,IAAI,EAAE,MAAM;QACvB,IAAA,sCAA+C,EAA7C,0BAAU,EAAE,4BAAiC,CAAC;QACtD,IAAI,UAAU,EAAE;YACd,IAAM,cAAc,GAClB,UAAU,CAAC,MAAM,GAAG,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,IAAI,CAAC;YAC3D,EAAE,CAAC,MAAM,CACP,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG,MAAM,CAAC,EAC9B,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG,MAAM,GAAG,cAAc,CAAC,CAChD,CAAC;~~SACH~~;IACH,CAAC,CAAC,CAAC;IACH,QAAQ,CAAC,EAAE,CAAC,CAAC;IACb,4BAAgB,CAAC,UAAU,CAAC,oCAAoC,CAAC,CAAC;IAClE,OAAO,IAAI,CAAC;AACd,CAAC;~~AAjBD~~,~~0BAiBC~~;AAED,SAAgB,YAAY,CAAC,KAAkB,EAAE,QAAQ;IAC/C,IAAA,qEAAuB,CAAkC;IACzD,IAAA,wEAAW,CAAoC;IACvD,IAAM,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,MAAM,CAC1C,WAAW,CAAC,IAAI,GAAG,CAAC,iBAAiB,CAAC,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC;QAC9D,WAAW,CAAC,IAAI,CACnB,CAAC;IACF,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC;IAC3C,4BAAgB,CAAC,UAAU,CAAC,0CAA0C,CAAC,CAAC;IACxE,OAAO,IAAI,CAAC;AACd,CAAC;AAVD,oCAUC;AAED,SAAgB,uBAAuB,CAAC,KAAkB,EAAE,QAAQ;IAC1D,IAAA,qEAAuB,CAAkC;IACzD,IAAA,sEAAU,CAAoC;IACtD,IAAI,UAAU,EAAE;QACd,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC;QACjD,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AARD,0DAQC"}
1	+ {"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../../../src/plugins/code-block/ide-ux/commands.ts"],"names":[],"mappings":"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"}

package/dist/es5/plugins/indentation/commands/index.js CHANGED Viewed

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var commands_1 = require("../../../commands");
+var utils_1 = require("./utils");
+var getAttrsWithChangesRecorder_1 = require("../../../utils/getAttrsWithChangesRecorder");
+var MAX_INDENTATION_LEVEL = 6;
 var isIndentationAllowed = function (schema, node, parent) {
     var _a = schema.nodes, paragraph = _a.paragraph, heading = _a.heading, alignment = schema.marks.alignment;
     if ([paragraph, heading].indexOf(node.type) > -1) {
@@ -12,32 +15,62 @@ var isIndentationAllowed = function (schema, node, parent) {
     }
     return false;
 };
-exports.indent = function (state, dispatch) {
-    var indentation = state.schema.marks.indentation;
-    return commands_1.toggleBlockMark(indentation, function (oldMark) {
-        // No mark - add a mark with level 1
-        return !oldMark
-            ? { level: 1 }
-            : // Level is at 6 or higher - do nothing
-                oldMark.level >= 6
-                    ? undefined
-                    : // For other cases - increase level by 1
-                        { level: oldMark.level + 1 };
-    }, isIndentationAllowed)(state, dispatch);
+/**
+ * Create new indentation command (Either indent or outdent depend of getArgsFn)
+ * @param getNewIndentationAttrs Function to handle new indentation level
+ */
+function createIndentationCommand(getNewIndentationAttrs) {
+    return function (state, dispatch) {
+        var indentation = state.schema.marks.indentation;
+        return commands_1.toggleBlockMark(indentation, getNewIndentationAttrs, isIndentationAllowed)(state, dispatch);
+    };
+}
+function createIndentationCommandWithAnalytics(getNewIndentationAttrs, direction) {
+    // Create a new getAttrs function to record the changes
+    var _a = getAttrsWithChangesRecorder_1.default(getNewIndentationAttrs, { direction: direction }), getAttrs = _a.getAttrs, getAndResetAttrsChanges = _a.getAndResetAttrsChanges;
+    // Use new getAttrs wrapper
+    var indentationCommand = createIndentationCommand(getAttrs);
+    // Return a new command where we change dispatch for our analytics dispatch
+    return function (state, dispatch) {
+        return indentationCommand(state, utils_1.createAnalyticsDispatch(getAndResetAttrsChanges, dispatch));
+    };
+}
+/**
+ * Get new level for outdent
+ * @param oldAttr Old attributes for the mark, undefined if the mark doesn't exit
+ * @returns  - undefined; No change required
+ *           - false; Remove the mark
+ *           - object; Update attributes
+ */
+var getIndentAttrs = function (oldAttr) {
+    if (!oldAttr) {
+        return { level: 1 }; // No mark exist, create a new one with level 1
+    }
+    var level = oldAttr.level;
+    if (level >= MAX_INDENTATION_LEVEL) {
+        return undefined; // Max indentation level reached, do nothing.
+    }
+    return { level: level + 1 }; // Otherwise, increase the level by one
 };
-exports.outdent = function (state, dispatch) {
-    var indentation = state.schema.marks.indentation;
-    return commands_1.toggleBlockMark(indentation, function (oldMark) {
-        // No mark - do nothing
-        return !oldMark
-            ? undefined
-            : // Level is at 1 or lower - remove the mark
-                oldMark.level <= 1
-                    ? false
-                    : // For other cases - decrease level by 1
-                        { level: oldMark.level - 1 };
-    }, isIndentationAllowed)(state, dispatch);
+exports.indent = createIndentationCommandWithAnalytics(getIndentAttrs, "indent" /* INDENT */);
+/**
+ * Get new level for outdent
+ * @param oldAttr Old attributes for the mark, undefined if the mark doesn't exit
+ * @returns  - undefined; No change required
+ *           - false; Remove the mark
+ *           - object; Update attributes
+ */
+var getOutdentAttrs = function (oldAttr) {
+    if (!oldAttr) {
+        return undefined; // Do nothing;
+    }
+    var level = oldAttr.level;
+    if (level <= 1) {
+        return false; // Remove the mark
+    }
+    return { level: level - 1 }; // Decrease the level on other cases
 };
+exports.outdent = createIndentationCommandWithAnalytics(getOutdentAttrs, "outdent" /* OUTDENT */);
 exports.removeIndentation = function (state, dispatch) {
     return commands_1.toggleBlockMark(state.schema.marks.indentation, function () { return false; })(state, dispatch);
 };

package/dist/es5/plugins/indentation/commands/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/plugins/indentation/commands/index.ts"],"names":[],"mappings":";;AAEA,8CAAoD;~~AAGpD~~,IAAM,oBAAoB,GAAG,UAAC,MAAc,EAAE,IAAY,EAAE,MAAc;IAEtE,IAAA,iBAA6B,EAApB,wBAAS,EAAE,oBAAO,EAClB,kCAAS,CACT;IAEX,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE;QAChD,IAAI,SAAS,EAAE;YACb,IAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CACpC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,IAAI,KAAK,SAAS,EAAvB,CAAuB,CAChC,CAAC,CAAC,CAAC,CAAC;YACL,OAAO,CAAC,YAAY,CAAC;SACtB;QACD,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;~~AAEW~~,~~QAAA~~,~~MAAM~~,~~GAAY~~,UAAC,KAAK,EAAE,QAAQ;~~IACrC~~,IAAA,4CAAW,CAAwB;~~IAE3C~~,OAAO,0BAAe,CACpB,WAAW,EACX,~~UAAA~~,~~OAAO;QACL~~,~~oCAAoC;QACpC~~,~~OAAA~~,CAAC,~~OAAO~~;~~YACN~~,CAAC,CAAC,~~EAAE~~,~~KAAK~~,EAAE,CAAC,~~EAAE~~;~~YACd~~,CAAC,CAAC,~~uCAAuC~~;~~gBACzC~~,OAAO,~~CAAC~~,KAAK,~~IAAI~~,~~CAAC~~;~~oBAClB~~,CAAC,CAAC,~~SAAS~~;~~oBACX~~,CAAC,CAAC,~~wCAAwC~~;~~wBACxC~~,~~EAAE~~,~~KAAK~~,EAAE,OAAO,~~CAAC~~,KAAK,~~GAAG~~,CAAC,EAAE;~~IANhC~~,~~CAMgC~~,~~EAClC~~,~~oBAAoB~~,~~CACrB~~,CAAC,KAAK,EAAE,~~QAAQ~~,CAAC,CAAC;~~AACrB~~,CAAC,CAAC;AAEW,QAAA,~~OAAO~~,GAAY,~~UAAC~~,~~KAAK~~,~~EAAE~~,~~QAAQ~~;~~IACtC~~,~~IAAA~~,~~4CAAW~~,~~CAAwB;IAC3C~~,~~OAAO~~,~~0BAAe~~,~~CACpB~~,~~WAAW~~,~~EACX,UAAA,~~OAAO~~;QACL~~,~~uBAAuB~~;~~QACvB~~,~~OAAA~~,~~CAAC~~,~~OAAO;YACN,~~CAAC,CAAC,~~SAAS~~;~~YACX~~,~~CAAC~~,~~CAAC~~,~~2CAA2C~~;~~gBAC7C~~,~~OAAO~~,~~CAAC,~~KAAK,IAAI,CAAC;~~oBAClB~~,~~CAAC~~,~~CAAC,~~KAAK~~;oBACP~~,CAAC,CAAC,~~wCAAwC~~;~~wBACxC~~,EAAE,KAAK,EAAE,~~OAAO,CAAC,~~KAAK,GAAG,CAAC,EAAE~~;IANhC~~,~~CAMgC~~,~~EAClC~~,~~oBAAoB~~,~~CACrB~~,CAAC,~~KAAK~~,~~EAAE~~,~~QAAQ~~,~~CAAC~~,~~CAAC;AACrB~~,~~CAAC~~,CAAC;AAEW,QAAA,iBAAiB,GAAY,UAAC,KAAK,EAAE,QAAQ;IACxD,OAAA,0BAAe,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,cAAM,OAAA,KAAK,EAAL,CAAK,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC;AAA7E,CAA6E,CAAC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/plugins/indentation/commands/index.ts"],"names":[],"mappings":";;AAEA,8CAAoD;AAEpD,iCAAkD;AAElD,0FAAqF;AAErF,IAAM,qBAAqB,GAAG,CAAC,CAAC;AAEhC,IAAM,oBAAoB,GAAG,UAAC,MAAc,EAAE,IAAY,EAAE,MAAc;IAEtE,IAAA,iBAA6B,EAApB,wBAAS,EAAE,oBAAO,EAClB,kCAAS,CACT;IAEX,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE;QAChD,IAAI,SAAS,EAAE;YACb,IAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CACpC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,IAAI,KAAK,SAAS,EAAvB,CAAuB,CAChC,CAAC,CAAC,CAAC,CAAC;YACL,OAAO,CAAC,YAAY,CAAC;SACtB;QACD,OAAO,IAAI,CAAC;KACb;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF;;;GAGG;AACH,SAAS,wBAAwB,CAC/B,sBAGkD;IAElD,OAAO,UAAC,KAAK,EAAE,QAAQ;QACb,IAAA,4CAAW,CAAwB;QAE3C,OAAO,0BAAe,CACpB,WAAW,EACX,sBAAsB,EACtB,oBAAoB,CACrB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACrB,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,qCAAqC,CAC5C,sBAGkD,EAClD,SAAqB;IAErB,uDAAuD;IACjD,IAAA,4FAGL,EAHO,sBAAQ,EAAE,oDAGjB,CAAC;IAEF,2BAA2B;IAC3B,IAAM,kBAAkB,GAAG,wBAAwB,CAAC,QAAQ,CAAC,CAAC;IAE9D,2EAA2E;IAC3E,OAAO,UAAC,KAAK,EAAE,QAAQ;QACrB,OAAO,kBAAkB,CACvB,KAAK,EACL,+BAAuB,CAAC,uBAAuB,EAAE,QAAQ,CAAC,CAC3D,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,IAAM,cAAc,GAAG,UACrB,OAAmC;IAEnC,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,+CAA+C;KACrE;IAEO,IAAA,qBAAK,CAAa;IAC1B,IAAI,KAAK,IAAI,qBAAqB,EAAE;QAClC,OAAO,SAAS,CAAC,CAAC,6CAA6C;KAChE;IACD,OAAO,EAAE,KAAK,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC,uCAAuC;AACtE,CAAC,CAAC;AAEW,QAAA,MAAM,GAAY,qCAAqC,CAClE,cAAc,wBAEf,CAAC;AAEF;;;;;;GAMG;AACH,IAAM,eAAe,GAAG,UACtB,OAAmC;IAEnC,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,SAAS,CAAC,CAAC,cAAc;KACjC;IAEO,IAAA,qBAAK,CAAa;IAC1B,IAAI,KAAK,IAAI,CAAC,EAAE;QACd,OAAO,KAAK,CAAC,CAAC,kBAAkB;KACjC;IAED,OAAO,EAAE,KAAK,EAAE,KAAK,GAAG,CAAC,EAAE,CAAC,CAAC,oCAAoC;AACnE,CAAC,CAAC;AAEW,QAAA,OAAO,GAAY,qCAAqC,CACnE,eAAe,0BAEhB,CAAC;AAEW,QAAA,iBAAiB,GAAY,UAAC,KAAK,EAAE,QAAQ;IACxD,OAAA,0BAAe,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,cAAM,OAAA,KAAK,EAAL,CAAK,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC;AAA7E,CAA6E,CAAC"}

package/dist/es5/plugins/indentation/commands/utils.d.ts ADDED Viewed

@@ -0,0 +1,30 @@
+import { IndentationMarkAttributes } from '../../../../../adf-schema';
+import { INDENT_DIR } from '../../analytics';
+import { Transaction } from 'prosemirror-state';
+import { GetAttrsChange } from '../../../utils/getAttrsWithChangesRecorder';
+declare type PrevAttributes = IndentationMarkAttributes | undefined;
+declare type NewAttributes = IndentationMarkAttributes | undefined | false;
+export declare type IndentationChangesOptions = {
+    direction: INDENT_DIR;
+};
+/**
+ * Get the current indentation level given prev and new attributes
+ * @param prevAttrs - Previous attributes from indentation
+ * @param newAttrs - New attributes from indentation
+ */
+export declare function getNewIndentLevel(prevAttrs: PrevAttributes, newAttrs: NewAttributes): number;
+/**
+ * Get the previous indentation level  prev attributes
+ * @param prevAttrs - Previous attributes from indentation
+ */
+export declare function getPrevIndentLevel(prevAttrs: PrevAttributes): number;
+/**
+ * Create a new dispatch function who add analytics events given a list of attributes changes
+ *
+ * @export
+ * @param {*} getAttrsChanges
+ * @param dispatch
+ * @returns
+ */
+export declare function createAnalyticsDispatch(getAttrsChanges: () => GetAttrsChange<IndentationMarkAttributes, IndentationChangesOptions>[], dispatch?: (tr: Transaction) => void): (tr: Transaction) => void;
+export {};

package/dist/es5/plugins/indentation/commands/utils.js ADDED Viewed

@@ -0,0 +1,74 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var analytics_1 = require("../../analytics");
+var indentTypes = {
+    paragraph: "paragraph" /* PARAGRAPH */,
+    heading: "heading" /* HEADING */,
+};
+/**
+ * Get the current indentation level given prev and new attributes
+ * @param prevAttrs - Previous attributes from indentation
+ * @param newAttrs - New attributes from indentation
+ */
+function getNewIndentLevel(prevAttrs, newAttrs) {
+    if (newAttrs === undefined) {
+        return prevAttrs.level;
+    }
+    else if (newAttrs === false) {
+        return 0;
+    }
+    return newAttrs.level;
+}
+exports.getNewIndentLevel = getNewIndentLevel;
+/**
+ * Get the previous indentation level  prev attributes
+ * @param prevAttrs - Previous attributes from indentation
+ */
+function getPrevIndentLevel(prevAttrs) {
+    if (prevAttrs === undefined) {
+        return 0;
+    }
+    return prevAttrs.level;
+}
+exports.getPrevIndentLevel = getPrevIndentLevel;
+/**
+ * Create a new dispatch function who add analytics events given a list of attributes changes
+ *
+ * @export
+ * @param {*} getAttrsChanges
+ * @param dispatch
+ * @returns
+ */
+function createAnalyticsDispatch(getAttrsChanges, dispatch) {
+    return function (tr) {
+        var currentTr = tr;
+        var changes = getAttrsChanges(); // Get all attributes changes
+        // Add analytics event for each change stored.
+        changes.forEach(function (_a) {
+            var node = _a.node, prevAttrs = _a.prevAttrs, newAttrs = _a.newAttrs, direction = _a.options.direction;
+            var indentType = indentTypes[node.type.name];
+            if (!indentType) {
+                return; // If no valid indent type continue
+            }
+            currentTr = analytics_1.addAnalytics(currentTr, {
+                action: "formatted" /* FORMATTED */,
+                actionSubject: "text" /* TEXT */,
+                actionSubjectId: "indentation" /* FORMAT_INDENT */,
+                eventType: "track" /* TRACK */,
+                attributes: {
+                    inputMethod: "keyboard" /* KEYBOARD */,
+                    previousIndentationLevel: getPrevIndentLevel(prevAttrs),
+                    newIndentLevel: getNewIndentLevel(prevAttrs, newAttrs),
+                    direction: direction,
+                    indentType: indentType,
+                },
+            });
+        });
+        // Dispatch analytics if exist
+        if (dispatch) {
+            dispatch(tr);
+        }
+    };
+}
+exports.createAnalyticsDispatch = createAnalyticsDispatch;
+//# sourceMappingURL=utils.js.map

package/dist/es5/plugins/indentation/commands/utils.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/plugins/indentation/commands/utils.ts"],"names":[],"mappings":";;AACA,6CASyB;AAWzB,IAAM,WAAW,GAAG;IAClB,SAAS,6BAAuB;IAChC,OAAO,yBAAqB;CAC7B,CAAC;AAEF;;;;GAIG;AACH,SAAgB,iBAAiB,CAC/B,SAAyB,EACzB,QAAuB;IAEvB,IAAI,QAAQ,KAAK,SAAS,EAAE;QAC1B,OAAO,SAAU,CAAC,KAAK,CAAC;KACzB;SAAM,IAAI,QAAQ,KAAK,KAAK,EAAE;QAC7B,OAAO,CAAC,CAAC;KACV;IACD,OAAO,QAAQ,CAAC,KAAK,CAAC;AACxB,CAAC;AAVD,8CAUC;AAED;;;GAGG;AACH,SAAgB,kBAAkB,CAAC,SAAyB;IAC1D,IAAI,SAAS,KAAK,SAAS,EAAE;QAC3B,OAAO,CAAC,CAAC;KACV;IACD,OAAO,SAAS,CAAC,KAAK,CAAC;AACzB,CAAC;AALD,gDAKC;AAED;;;;;;;GAOG;AACH,SAAgB,uBAAuB,CACrC,eAGG,EACH,QAAoC;IAEpC,OAAO,UAAC,EAAe;QACrB,IAAI,SAAS,GAAG,EAAE,CAAC;QACnB,IAAM,OAAO,GAAG,eAAe,EAAE,CAAC,CAAC,6BAA6B;QAEhE,8CAA8C;QAC9C,OAAO,CAAC,OAAO,CAAC,UAAC,EAAqD;gBAAnD,cAAI,EAAE,wBAAS,EAAE,sBAAQ,EAAa,gCAAS;YAChE,IAAM,UAAU,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/C,IAAI,CAAC,UAAU,EAAE;gBACf,OAAO,CAAC,mCAAmC;aAC5C;YAED,SAAS,GAAG,wBAAY,CAAC,SAAS,EAAE;gBAClC,MAAM,6BAAkB;gBACxB,aAAa,mBAAqB;gBAClC,eAAe,mCAAiC;gBAChD,SAAS,qBAAkB;gBAC3B,UAAU,EAAE;oBACV,WAAW,2BAAuB;oBAClC,wBAAwB,EAAE,kBAAkB,CAAC,SAAS,CAAC;oBACvD,cAAc,EAAE,iBAAiB,CAAC,SAAS,EAAE,QAAQ,CAAC;oBACtD,SAAS,WAAA;oBACT,UAAU,YAAA;iBACX;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,8BAA8B;QAC9B,IAAI,QAAQ,EAAE;YACZ,QAAQ,CAAC,EAAE,CAAC,CAAC;SACd;IACH,CAAC,CAAC;AACJ,CAAC;AAtCD,0DAsCC"}

package/dist/es5/plugins/lists/commands.js CHANGED Viewed

@@ -11,6 +11,7 @@ var commands_1 = require("../../utils/commands");
 var utils_1 = require("../../utils");
 var transforms_1 = require("./transforms");
 var gap_cursor_1 = require("../gap-cursor");
+var analytics_1 = require("../analytics");
 var maxIndentation = 5;
 var deletePreviousEmptyListItem = function (state, dispatch) {
     var $from = state.selection.$from;
@@ -197,22 +198,17 @@ function splitListItem(itemType) {
         return true;
     };
 }
-function outdentList() {
-    return function (state, dispatch) {
-        var listItem = state.schema.nodes.listItem;
-        var _a = state.selection, $from = _a.$from, $to = _a.$to;
-        if (isInsideListItem(state)) {
-            // if we're backspacing at the start of a list item, unindent it
-            // take the the range of nodes we might be lifting
-            // the predicate is for when you're backspacing a top level list item:
-            // we don't want to go up past the doc node, otherwise the range
-            // to clear will include everything
-            var range = $from.blockRange($to, function (node) { return node.childCount > 0 && node.firstChild.type === listItem; });
-            if (!range) {
-                return false;
-            }
-            var tr_1;
-            if (baseListCommand.liftListItem(listItem)(state, function (liftTr) { return (tr_1 = liftTr); })) {
+/**
+ * Merge closest bullet list blocks into one
+ *
+ * @param {NodeType} listItem
+ * @param {NodeRange} range
+ * @returns
+ */
+function mergeLists(listItem, range) {
+    return function (command) {
+        return function (state, dispatch) {
+            return command(state, function (tr) {
                 /* we now need to handle the case that we lifted a sublist out,
                  * and any listItems at the current level get shifted out to
                  * their own new list; e.g.:
@@ -241,50 +237,108 @@ function outdentList() {
                  */
                 var $start = state.doc.resolve(range.start);
                 var $end = state.doc.resolve(range.end);
-                var $join = tr_1.doc.resolve(tr_1.mapping.map(range.end - 1));
+                var $join = tr.doc.resolve(tr.mapping.map(range.end - 1));
                 if ($join.nodeBefore &&
                     $join.nodeAfter &&
                     $join.nodeBefore.type === $join.nodeAfter.type) {
                     if ($end.nodeAfter &&
                         $end.nodeAfter.type === listItem &&
                         $end.parent.type === $start.parent.type) {
-                        tr_1.join($join.pos);
+                        tr.join($join.pos);
                     }
                 }
                 if (dispatch) {
-                    dispatch(tr_1.scrollIntoView());
+                    dispatch(tr.scrollIntoView());
                 }
-                return true;
+            });
+        };
+    };
+}
+function outdentList() {
+    return function (state, dispatch) {
+        var listItem = state.schema.nodes.listItem;
+        var _a = state.selection, $from = _a.$from, $to = _a.$to;
+        if (isInsideListItem(state)) {
+            // if we're backspacing at the start of a list item, unindent it
+            // take the the range of nodes we might be lifting
+            // the predicate is for when you're backspacing a top level list item:
+            // we don't want to go up past the doc node, otherwise the range
+            // to clear will include everything
+            var range = $from.blockRange($to, function (node) { return node.childCount > 0 && node.firstChild.type === listItem; });
+            if (!range) {
+                return false;
             }
+            var initialIndentationLevel = exports.numberNestedLists(state.selection.$from, state.schema.nodes);
+            return utils_1.compose(analytics_1.withAnalytics({
+                action: "formatted" /* FORMATTED */,
+                actionSubject: "text" /* TEXT */,
+                actionSubjectId: "indentation" /* FORMAT_INDENT */,
+                eventType: "track" /* TRACK */,
+                attributes: {
+                    inputMethod: "keyboard" /* KEYBOARD */,
+                    previousIndentationLevel: initialIndentationLevel,
+                    newIndentLevel: initialIndentationLevel - 1,
+                    direction: "outdent" /* OUTDENT */,
+                    indentType: "list" /* LIST */,
+                },
+            }), // 3. Send analytics event
+            mergeLists(listItem, range), // 2. Check if I need to merge nearest list
+            baseListCommand.liftListItem)(listItem)(state, dispatch);
         }
         return false;
     };
 }
 exports.outdentList = outdentList;
+/**
+ * Check if we can sink the list.
+ *
+ * @param {number} initialIndentationLevel
+ * @param {EditorState} state
+ * @returns {boolean} - true if we can sink the list
+ *                    - false if we reach the max indentation level
+ */
+function canSink(initialIndentationLevel, state) {
+    /*
+        - Keep going forward in document until indentation of the node is < than the initial
+        - If indentation is EVER > max indentation, return true and don't sink the list
+        */
+    var currentIndentationLevel;
+    var currentPos = state.tr.selection.$to.pos;
+    do {
+        var resolvedPos = state.doc.resolve(currentPos);
+        currentIndentationLevel = exports.numberNestedLists(resolvedPos, state.schema.nodes);
+        if (currentIndentationLevel > maxIndentation) {
+            // Cancel sink list.
+            // If current indentation less than the initial, it won't be
+            // larger than the max, and the loop will terminate at end of this iteration
+            return false;
+        }
+        currentPos++;
+    } while (currentIndentationLevel >= initialIndentationLevel);
+    return true;
+}
 function indentList() {
     return function (state, dispatch) {
         var listItem = state.schema.nodes.listItem;
         if (isInsideListItem(state)) {
+            // Record initial list indentation
             var initialIndentationLevel = exports.numberNestedLists(state.selection.$from, state.schema.nodes);
-            /*
-            - Record initial list indentation
-            - Keep going forward in document until indentation of the node is < than the initial
-            - If indentation is EVER > max indentation, return true and don't sink the list
-            */
-            var currentIndentationLevel = void 0;
-            var currentPos = state.tr.selection.$to.pos;
-            do {
-                var resolvedPos = state.doc.resolve(currentPos);
-                currentIndentationLevel = exports.numberNestedLists(resolvedPos, state.schema.nodes);
-                if (currentIndentationLevel > maxIndentation) {
-                    // Cancel sink list.
-                    // If current indentation less than the initial, it won't be
-                    // larger than the max, and the loop will terminate at end of this iteration
-                    return true;
-                }
-                currentPos++;
-            } while (currentIndentationLevel >= initialIndentationLevel);
-            baseListCommand.sinkListItem(listItem)(state, dispatch);
+            if (canSink(initialIndentationLevel, state)) {
+                // Analytics command wrapper should be here because we need to get indentation level
+                utils_1.compose(analytics_1.withAnalytics({
+                    action: "formatted" /* FORMATTED */,
+                    actionSubject: "text" /* TEXT */,
+                    actionSubjectId: "indentation" /* FORMAT_INDENT */,
+                    eventType: "track" /* TRACK */,
+                    attributes: {
+                        inputMethod: "keyboard" /* KEYBOARD */,
+                        previousIndentationLevel: initialIndentationLevel,
+                        newIndentLevel: initialIndentationLevel + 1,
+                        direction: "indent" /* INDENT */,
+                        indentType: "list" /* LIST */,
+                    },
+                }), baseListCommand.sinkListItem)(listItem)(state, dispatch);
+            }
             return true;
         }
         return false;