@atlaskit/editor-plugin-text-formatting 6.1.4 → 6.1.6

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-text-formatting
 
+## 6.1.6
+
+### Patch Changes
+
+- [`3c501a06f7c8b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3c501a06f7c8b) -
+  [ux] [EDITOR-2460] detect and format backticks that close strings on the LHS
+- Updated dependencies
+
+## 6.1.5
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 6.1.4
 
 ### Patch Changes

package/dist/cjs/pm-plugins/input-rule.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.codeRegex = exports.ValidCombinations = void 0;
+exports.default = exports.codeRegexWithBackwardMatch = exports.codeRegex = exports.ValidCombinations = void 0;
 exports.inputRulePlugin = inputRulePlugin;
 exports.strongRegex2 = exports.strongRegex1 = exports.strikeRegex = exports.italicRegex2 = exports.italicRegex1 = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -22,6 +22,7 @@ var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _utils = require("@atlaskit/editor-common/utils");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 function _superPropGet(t, o, e, r) { var p = (0, _get2.default)((0, _getPrototypeOf2.default)(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
@@ -72,7 +73,14 @@ function addMark(markType, _schema, char, api) {
     // fixes the following case: my `*name` is *
     // expected result: should ignore special characters inside "code"
     if (textPrefix !== char || schema !== null && schema !== void 0 && (_schema$marks = schema.marks) !== null && _schema$marks !== void 0 && (_schema$marks = _schema$marks.code) !== null && _schema$marks !== void 0 && _schema$marks.isInSet(doc.resolve(start + 1).marks())) {
-      return null;
+      if (!(0, _expValEquals.expValEquals)('platform_editor_lovability_inline_code', 'isEnabled', true)) {
+        return null;
+      }
+      // if the prefix is not a character but the suffix is, continue
+      var suffix = state.doc.textBetween(end - char.length, end);
+      if (suffix !== char) {
+        return null;
+      }
     }
 
     // Prevent autoformatting across hardbreaks
@@ -170,12 +178,39 @@ var buildRegex = function buildRegex(char) {
   baseRegex.replace(/X/g, escapedChar);
   return new ReverseRegexExp(replacedRegex);
 };
+var buildRegexNew = function buildRegexNew(char) {
+  var allowsBackwardMatch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  // Ignored via go/ees005
+  // eslint-disable-next-line require-unicode-regexp
+  var escapedChar = char.replace(/(\W)/g, '\\$1');
+  // Ignored via go/ees005
+  // eslint-disable-next-line require-unicode-regexp
+  var combinations = ValidCombinations[char].map(function (c) {
+    return c.replace(/(\W)/g, '\\$1');
+  }).join('|');
+
+  // Single X - https://regex101.com/r/McT3yq/14/
+  // Double X - https://regex101.com/r/pQUgjx/1/
+  // if backwards matches are allowed, do not prefix the regex with an anchor (^)
+  var maybeAnchor = allowsBackwardMatch ? '' : '^';
+  var orCombinations = combinations ? "|".concat(combinations) : '';
+  var baseRegex = "".concat(maybeAnchor, "X(?=[^X\\s]).*?[^\\sX]X(?=[\\s").concat(_prosemirrorInputRules.leafNodeReplacementCharacter, "]").concat(orCombinations, "|$)");
+  var replacedRegex = String.prototype.hasOwnProperty('replaceAll') ?
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  baseRegex.replaceAll('X', escapedChar) :
+  // Ignored via go/ees005
+  // eslint-disable-next-line require-unicode-regexp
+  baseRegex.replace(/X/g, escapedChar);
+  return new ReverseRegexExp(replacedRegex);
+};
 var strongRegex1 = exports.strongRegex1 = buildRegex(ValidAutoformatChars.STRONG);
 var strongRegex2 = exports.strongRegex2 = buildRegex(ValidAutoformatChars.STRONG_MARKDOWN);
 var italicRegex1 = exports.italicRegex1 = buildRegex(ValidAutoformatChars.ITALIC);
 var italicRegex2 = exports.italicRegex2 = buildRegex(ValidAutoformatChars.ITALIC_MARKDOWN);
 var strikeRegex = exports.strikeRegex = buildRegex(ValidAutoformatChars.STRIKE);
 var codeRegex = exports.codeRegex = buildRegex(ValidAutoformatChars.CODE);
+var codeRegexWithBackwardMatch = exports.codeRegexWithBackwardMatch = buildRegexNew(ValidAutoformatChars.CODE, true);
 
 /**
  * Create input rules for strong mark
@@ -256,7 +291,8 @@ function getCodeInputRules(schema, editorAnalyticsAPI, api) {
       inputMethod: _analytics.INPUT_METHOD.FORMATTING
     }
   }, editorAnalyticsAPI);
-  var backTickRule = (0, _utils.createRule)(codeRegex, addMark(schema.marks.code, schema, ValidAutoformatChars.CODE, api));
+  var allowsBackwardMatch = (0, _expValEquals.expValEquals)('platform_editor_lovability_inline_code', 'isEnabled', true);
+  var backTickRule = (0, _utils.createRule)(allowsBackwardMatch ? codeRegexWithBackwardMatch : codeRegex, addMark(schema.marks.code, schema, ValidAutoformatChars.CODE, api), allowsBackwardMatch);
   return [ruleWithCodeAnalytics(backTickRule)];
 }
 function inputRulePlugin(schema, editorAnalyticsAPI, api) {

package/dist/es2019/pm-plugins/input-rule.js

@@ -4,6 +4,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { createRule, inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { createPlugin, leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 var ValidAutoformatChars = /*#__PURE__*/function (ValidAutoformatChars) {
   ValidAutoformatChars["STRONG"] = "__";
   ValidAutoformatChars["STRIKE"] = "~~";
@@ -60,7 +61,14 @@ function addMark(markType, _schema, char, api) {
     // fixes the following case: my `*name` is *
     // expected result: should ignore special characters inside "code"
     if (textPrefix !== char || schema !== null && schema !== void 0 && (_schema$marks = schema.marks) !== null && _schema$marks !== void 0 && (_schema$marks$code = _schema$marks.code) !== null && _schema$marks$code !== void 0 && _schema$marks$code.isInSet(doc.resolve(start + 1).marks())) {
-      return null;
+      if (!expValEquals('platform_editor_lovability_inline_code', 'isEnabled', true)) {
+        return null;
+      }
+      // if the prefix is not a character but the suffix is, continue
+      const suffix = state.doc.textBetween(end - char.length, end);
+      if (suffix !== char) {
+        return null;
+      }
     }
 
     // Prevent autoformatting across hardbreaks
@@ -148,12 +156,36 @@ const buildRegex = char => {
   baseRegex.replace(/X/g, escapedChar);
   return new ReverseRegexExp(replacedRegex);
 };
+const buildRegexNew = (char, allowsBackwardMatch = false) => {
+  // Ignored via go/ees005
+  // eslint-disable-next-line require-unicode-regexp
+  const escapedChar = char.replace(/(\W)/g, '\\$1');
+  // Ignored via go/ees005
+  // eslint-disable-next-line require-unicode-regexp
+  const combinations = ValidCombinations[char].map(c => c.replace(/(\W)/g, '\\$1')).join('|');
+
+  // Single X - https://regex101.com/r/McT3yq/14/
+  // Double X - https://regex101.com/r/pQUgjx/1/
+  // if backwards matches are allowed, do not prefix the regex with an anchor (^)
+  const maybeAnchor = allowsBackwardMatch ? '' : '^';
+  const orCombinations = combinations ? `|${combinations}` : '';
+  const baseRegex = `${maybeAnchor}X(?=[^X\\s]).*?[^\\sX]X(?=[\\s${leafNodeReplacementCharacter}]${orCombinations}|$)`;
+  const replacedRegex = String.prototype.hasOwnProperty('replaceAll') ?
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  baseRegex.replaceAll('X', escapedChar) :
+  // Ignored via go/ees005
+  // eslint-disable-next-line require-unicode-regexp
+  baseRegex.replace(/X/g, escapedChar);
+  return new ReverseRegexExp(replacedRegex);
+};
 export const strongRegex1 = buildRegex(ValidAutoformatChars.STRONG);
 export const strongRegex2 = buildRegex(ValidAutoformatChars.STRONG_MARKDOWN);
 export const italicRegex1 = buildRegex(ValidAutoformatChars.ITALIC);
 export const italicRegex2 = buildRegex(ValidAutoformatChars.ITALIC_MARKDOWN);
 export const strikeRegex = buildRegex(ValidAutoformatChars.STRIKE);
 export const codeRegex = buildRegex(ValidAutoformatChars.CODE);
+export const codeRegexWithBackwardMatch = buildRegexNew(ValidAutoformatChars.CODE, true);
 
 /**
  * Create input rules for strong mark
@@ -234,7 +266,8 @@ function getCodeInputRules(schema, editorAnalyticsAPI, api) {
       inputMethod: INPUT_METHOD.FORMATTING
     }
   }, editorAnalyticsAPI);
-  const backTickRule = createRule(codeRegex, addMark(schema.marks.code, schema, ValidAutoformatChars.CODE, api));
+  const allowsBackwardMatch = expValEquals('platform_editor_lovability_inline_code', 'isEnabled', true);
+  const backTickRule = createRule(allowsBackwardMatch ? codeRegexWithBackwardMatch : codeRegex, addMark(schema.marks.code, schema, ValidAutoformatChars.CODE, api), allowsBackwardMatch);
   return [ruleWithCodeAnalytics(backTickRule)];
 }
 export function inputRulePlugin(schema, editorAnalyticsAPI, api) {

package/dist/esm/pm-plugins/input-rule.js

@@ -16,6 +16,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { createRule, inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { createPlugin, leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 var ValidAutoformatChars = /*#__PURE__*/function (ValidAutoformatChars) {
   ValidAutoformatChars["STRONG"] = "__";
   ValidAutoformatChars["STRIKE"] = "~~";
@@ -63,7 +64,14 @@ function addMark(markType, _schema, char, api) {
     // fixes the following case: my `*name` is *
     // expected result: should ignore special characters inside "code"
     if (textPrefix !== char || schema !== null && schema !== void 0 && (_schema$marks = schema.marks) !== null && _schema$marks !== void 0 && (_schema$marks = _schema$marks.code) !== null && _schema$marks !== void 0 && _schema$marks.isInSet(doc.resolve(start + 1).marks())) {
-      return null;
+      if (!expValEquals('platform_editor_lovability_inline_code', 'isEnabled', true)) {
+        return null;
+      }
+      // if the prefix is not a character but the suffix is, continue
+      var suffix = state.doc.textBetween(end - char.length, end);
+      if (suffix !== char) {
+        return null;
+      }
     }
 
     // Prevent autoformatting across hardbreaks
@@ -161,12 +169,39 @@ var buildRegex = function buildRegex(char) {
   baseRegex.replace(/X/g, escapedChar);
   return new ReverseRegexExp(replacedRegex);
 };
+var buildRegexNew = function buildRegexNew(char) {
+  var allowsBackwardMatch = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  // Ignored via go/ees005
+  // eslint-disable-next-line require-unicode-regexp
+  var escapedChar = char.replace(/(\W)/g, '\\$1');
+  // Ignored via go/ees005
+  // eslint-disable-next-line require-unicode-regexp
+  var combinations = ValidCombinations[char].map(function (c) {
+    return c.replace(/(\W)/g, '\\$1');
+  }).join('|');
+
+  // Single X - https://regex101.com/r/McT3yq/14/
+  // Double X - https://regex101.com/r/pQUgjx/1/
+  // if backwards matches are allowed, do not prefix the regex with an anchor (^)
+  var maybeAnchor = allowsBackwardMatch ? '' : '^';
+  var orCombinations = combinations ? "|".concat(combinations) : '';
+  var baseRegex = "".concat(maybeAnchor, "X(?=[^X\\s]).*?[^\\sX]X(?=[\\s").concat(leafNodeReplacementCharacter, "]").concat(orCombinations, "|$)");
+  var replacedRegex = String.prototype.hasOwnProperty('replaceAll') ?
+  // Ignored via go/ees005
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  baseRegex.replaceAll('X', escapedChar) :
+  // Ignored via go/ees005
+  // eslint-disable-next-line require-unicode-regexp
+  baseRegex.replace(/X/g, escapedChar);
+  return new ReverseRegexExp(replacedRegex);
+};
 export var strongRegex1 = buildRegex(ValidAutoformatChars.STRONG);
 export var strongRegex2 = buildRegex(ValidAutoformatChars.STRONG_MARKDOWN);
 export var italicRegex1 = buildRegex(ValidAutoformatChars.ITALIC);
 export var italicRegex2 = buildRegex(ValidAutoformatChars.ITALIC_MARKDOWN);
 export var strikeRegex = buildRegex(ValidAutoformatChars.STRIKE);
 export var codeRegex = buildRegex(ValidAutoformatChars.CODE);
+export var codeRegexWithBackwardMatch = buildRegexNew(ValidAutoformatChars.CODE, true);
 
 /**
  * Create input rules for strong mark
@@ -247,7 +282,8 @@ function getCodeInputRules(schema, editorAnalyticsAPI, api) {
       inputMethod: INPUT_METHOD.FORMATTING
     }
   }, editorAnalyticsAPI);
-  var backTickRule = createRule(codeRegex, addMark(schema.marks.code, schema, ValidAutoformatChars.CODE, api));
+  var allowsBackwardMatch = expValEquals('platform_editor_lovability_inline_code', 'isEnabled', true);
+  var backTickRule = createRule(allowsBackwardMatch ? codeRegexWithBackwardMatch : codeRegex, addMark(schema.marks.code, schema, ValidAutoformatChars.CODE, api), allowsBackwardMatch);
   return [ruleWithCodeAnalytics(backTickRule)];
 }
 export function inputRulePlugin(schema, editorAnalyticsAPI, api) {

package/dist/types/pm-plugins/input-rule.d.ts

@@ -21,5 +21,6 @@ export declare const italicRegex1: ReverseRegexExp;
 export declare const italicRegex2: ReverseRegexExp;
 export declare const strikeRegex: ReverseRegexExp;
 export declare const codeRegex: ReverseRegexExp;
+export declare const codeRegexWithBackwardMatch: ReverseRegexExp;
 export declare function inputRulePlugin(schema: Schema, editorAnalyticsAPI: EditorAnalyticsAPI | undefined, api: ExtractInjectionAPI<TextFormattingPlugin> | undefined): SafePlugin | undefined;
 export default inputRulePlugin;

package/dist/types-ts4.5/pm-plugins/input-rule.d.ts

@@ -21,5 +21,6 @@ export declare const italicRegex1: ReverseRegexExp;
 export declare const italicRegex2: ReverseRegexExp;
 export declare const strikeRegex: ReverseRegexExp;
 export declare const codeRegex: ReverseRegexExp;
+export declare const codeRegexWithBackwardMatch: ReverseRegexExp;
 export declare function inputRulePlugin(schema: Schema, editorAnalyticsAPI: EditorAnalyticsAPI | undefined, api: ExtractInjectionAPI<TextFormattingPlugin> | undefined): SafePlugin | undefined;
 export default inputRulePlugin;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-text-formatting",
-	"version": "6.1.4",
+	"version": "6.1.6",
 	"description": "Text-formatting plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -38,19 +38,19 @@
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.8.0",
 		"@atlaskit/editor-tables": "^2.9.0",
-		"@atlaskit/editor-toolbar": "^0.16.0",
+		"@atlaskit/editor-toolbar": "^0.17.0",
 		"@atlaskit/editor-toolbar-model": "^0.2.0",
 		"@atlaskit/icon": "^28.5.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/prosemirror-input-rules": "^3.5.0",
-		"@atlaskit/tmp-editor-statsig": "^13.18.0",
-		"@atlaskit/tokens": "^7.0.0",
+		"@atlaskit/prosemirror-input-rules": "^3.6.0",
+		"@atlaskit/tmp-editor-statsig": "^13.27.0",
+		"@atlaskit/tokens": "^7.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.18.0",
+		"@atlaskit/editor-common": "^110.22.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {