@atlaskit/editor-plugin-date 0.2.7 → 0.2.9

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-date
 
+## 0.2.9
+
+### Patch Changes
+
+- [#43549](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/43549) [`8f05c711498`](https://bitbucket.org/atlassian/atlassian-frontend/commits/8f05c711498) - ED-20957 Fixed issue with adding date node inside a codeblock
+
+## 0.2.8
+
+### Patch Changes
+
+- [#43694](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/43694) [`fa3d07e4692`](https://bitbucket.org/atlassian/atlassian-frontend/commits/fa3d07e4692) - [ux] [ED-20697] Fix issue where dates with dashes were being incorrectly marked as invalid
+
 ## 0.2.7
 
 ### Patch Changes

package/dist/cjs/actions.js

@@ -8,17 +8,23 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _utils = require("@atlaskit/editor-common/utils");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _state = require("@atlaskit/editor-prosemirror/state");
+var _utils2 = require("@atlaskit/editor-prosemirror/utils");
 var _pluginKey = require("./pm-plugins/plugin-key");
 var _internal = require("./utils/internal");
 var createDate = exports.createDate = function createDate(isQuickInsertAction) {
-  return function (insert, state) {
+  return function (state) {
     var dateNode = state.schema.nodes.date.createChecked({
       timestamp: (0, _utils.todayTimestampInUTC)()
     });
-    var space = state.schema.text(' ');
-    var tr = insert(_model.Fragment.from([dateNode, space]), {
-      selectInlineNode: true
-    });
+    var fragment = _model.Fragment.fromArray([dateNode, state.schema.text(' ')]);
+    var tr = state.tr;
+    var insertable = (0, _utils2.canInsert)(tr.selection.$from, fragment);
+    if (!insertable) {
+      var parentSelection = _state.NodeSelection.create(tr.doc, tr.selection.from - tr.selection.$anchor.parentOffset - 1);
+      tr.insert(parentSelection.to, fragment).setSelection(_state.NodeSelection.create(tr.doc, parentSelection.to + 1));
+    } else {
+      tr.insert(tr.selection.from, fragment).setSelection(_state.NodeSelection.create(tr.doc, tr.selection.from - fragment.size));
+    }
     var newPluginState = {
       isQuickInsertAction: isQuickInsertAction,
       showDatePickerAt: tr.selection.from,

package/dist/cjs/plugin.js

@@ -177,7 +177,7 @@ var datePlugin = function datePlugin(_ref3) {
           },
           action: function action(insert, state) {
             var _api$analytics, _api$analytics$attach;
-            var tr = (0, _actions.createDate)(true)(insert, state);
+            var tr = (0, _actions.createDate)(true)(state);
             api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 || (_api$analytics$attach = _api$analytics.attachAnalyticsEvent) === null || _api$analytics$attach === void 0 || _api$analytics$attach.call(_api$analytics, {
               action: _analytics.ACTION.INSERTED,
               actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,

package/dist/cjs/utils/internal.js

@@ -75,7 +75,7 @@ function isDatePossiblyValid(date) {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var c = _step.value;
       var isNumber = c >= '0' && c <= '9';
-      var isValidPunctuation = '. ,/'.indexOf(c) !== -1;
+      var isValidPunctuation = '. ,/-'.indexOf(c) !== -1;
       if (!(isNumber || isValidPunctuation)) {
         return false;
       }

package/dist/es2019/actions.js

@@ -2,16 +2,22 @@ import { ACTION, ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/edit
 import { todayTimestampInUTC } from '@atlaskit/editor-common/utils';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
+import { canInsert } from '@atlaskit/editor-prosemirror/utils';
 import { pluginKey } from './pm-plugins/plugin-key';
 import { isToday } from './utils/internal';
-export const createDate = isQuickInsertAction => (insert, state) => {
+export const createDate = isQuickInsertAction => state => {
   const dateNode = state.schema.nodes.date.createChecked({
     timestamp: todayTimestampInUTC()
   });
-  const space = state.schema.text(' ');
-  const tr = insert(Fragment.from([dateNode, space]), {
-    selectInlineNode: true
-  });
+  const fragment = Fragment.fromArray([dateNode, state.schema.text(' ')]);
+  const tr = state.tr;
+  const insertable = canInsert(tr.selection.$from, fragment);
+  if (!insertable) {
+    const parentSelection = NodeSelection.create(tr.doc, tr.selection.from - tr.selection.$anchor.parentOffset - 1);
+    tr.insert(parentSelection.to, fragment).setSelection(NodeSelection.create(tr.doc, parentSelection.to + 1));
+  } else {
+    tr.insert(tr.selection.from, fragment).setSelection(NodeSelection.create(tr.doc, tr.selection.from - fragment.size));
+  }
   const newPluginState = {
     isQuickInsertAction,
     showDatePickerAt: tr.selection.from,

package/dist/es2019/plugin.js

@@ -165,7 +165,7 @@ const datePlugin = ({
       icon: () => /*#__PURE__*/React.createElement(IconDate, null),
       action(insert, state) {
         var _api$analytics, _api$analytics$action, _api$analytics$action2;
-        const tr = createDate(true)(insert, state);
+        const tr = createDate(true)(state);
         api === null || api === void 0 ? void 0 : (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : (_api$analytics$action = _api$analytics.actions) === null || _api$analytics$action === void 0 ? void 0 : (_api$analytics$action2 = _api$analytics$action.attachAnalyticsEvent) === null || _api$analytics$action2 === void 0 ? void 0 : _api$analytics$action2.call(_api$analytics$action, {
           action: ACTION.INSERTED,
           actionSubject: ACTION_SUBJECT.DOCUMENT,

package/dist/es2019/utils/internal.js

@@ -57,7 +57,7 @@ function isCursorInLastDateSegment(cursorPos, date) {
 export function isDatePossiblyValid(date) {
   for (const c of date) {
     const isNumber = c >= '0' && c <= '9';
-    const isValidPunctuation = '. ,/'.indexOf(c) !== -1;
+    const isValidPunctuation = '. ,/-'.indexOf(c) !== -1;
     if (!(isNumber || isValidPunctuation)) {
       return false;
     }

package/dist/esm/actions.js

@@ -2,17 +2,23 @@ import { ACTION, ACTION_SUBJECT, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/edit
 import { todayTimestampInUTC } from '@atlaskit/editor-common/utils';
 import { Fragment } from '@atlaskit/editor-prosemirror/model';
 import { NodeSelection, Selection } from '@atlaskit/editor-prosemirror/state';
+import { canInsert } from '@atlaskit/editor-prosemirror/utils';
 import { pluginKey } from './pm-plugins/plugin-key';
 import { isToday } from './utils/internal';
 export var createDate = function createDate(isQuickInsertAction) {
-  return function (insert, state) {
+  return function (state) {
     var dateNode = state.schema.nodes.date.createChecked({
       timestamp: todayTimestampInUTC()
     });
-    var space = state.schema.text(' ');
-    var tr = insert(Fragment.from([dateNode, space]), {
-      selectInlineNode: true
-    });
+    var fragment = Fragment.fromArray([dateNode, state.schema.text(' ')]);
+    var tr = state.tr;
+    var insertable = canInsert(tr.selection.$from, fragment);
+    if (!insertable) {
+      var parentSelection = NodeSelection.create(tr.doc, tr.selection.from - tr.selection.$anchor.parentOffset - 1);
+      tr.insert(parentSelection.to, fragment).setSelection(NodeSelection.create(tr.doc, parentSelection.to + 1));
+    } else {
+      tr.insert(tr.selection.from, fragment).setSelection(NodeSelection.create(tr.doc, tr.selection.from - fragment.size));
+    }
     var newPluginState = {
       isQuickInsertAction: isQuickInsertAction,
       showDatePickerAt: tr.selection.from,

package/dist/esm/plugin.js

@@ -165,7 +165,7 @@ var datePlugin = function datePlugin(_ref3) {
           },
           action: function action(insert, state) {
             var _api$analytics, _api$analytics$attach;
-            var tr = createDate(true)(insert, state);
+            var tr = createDate(true)(state);
             api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 || (_api$analytics = _api$analytics.actions) === null || _api$analytics === void 0 || (_api$analytics$attach = _api$analytics.attachAnalyticsEvent) === null || _api$analytics$attach === void 0 || _api$analytics$attach.call(_api$analytics, {
               action: ACTION.INSERTED,
               actionSubject: ACTION_SUBJECT.DOCUMENT,

package/dist/esm/utils/internal.js

@@ -64,7 +64,7 @@ export function isDatePossiblyValid(date) {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var c = _step.value;
       var isNumber = c >= '0' && c <= '9';
-      var isValidPunctuation = '. ,/'.indexOf(c) !== -1;
+      var isValidPunctuation = '. ,/-'.indexOf(c) !== -1;
       if (!(isNumber || isValidPunctuation)) {
         return false;
       }

package/dist/types/actions.d.ts

@@ -1,9 +1,7 @@
 import type { Command, CommandDispatch, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { DatePlugin, DateType } from './types';
-export declare const createDate: (isQuickInsertAction?: boolean) => (insert: (node: Node | Object | string, opts?: {
-    selectInlineNode: boolean;
-}) => Transaction, state: EditorState) => Transaction;
+export declare const createDate: (isQuickInsertAction?: boolean) => (state: EditorState) => Transaction;
 /** Focus input */
 export declare const focusDateInput: () => (state: EditorState, dispatch: CommandDispatch | undefined) => boolean;
 export declare const setDatePickerAt: (showDatePickerAt: number | null) => (state: EditorState, dispatch: (tr: Transaction) => void) => boolean;
@@ -19,10 +17,10 @@ export declare const closeDatePickerWithAnalytics: ({ date, pluginInjectionApi,
                 attachAnalyticsEvent: import("@atlaskit/editor-plugin-analytics").CreateAttachPayloadIntoTransaction | null;
                 performanceTracking: import("@atlaskit/editor-common/types").PerformanceTracking | undefined;
             };
-            dependencies: [import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
+            dependencies: [import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
                 pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
                 sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
-            }, import("@atlaskit/editor-common/types").FeatureFlags>];
+            }, import("@atlaskit/editor-common/types").FeatureFlags>>];
             actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
         }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorDisabled", {
             sharedState: import("@atlaskit/editor-plugin-editor-disabled").EditorDisabledPluginState;
@@ -39,10 +37,10 @@ export declare const closeDatePickerWithAnalytics: ({ date, pluginInjectionApi,
             attachAnalyticsEvent: import("@atlaskit/editor-plugin-analytics").CreateAttachPayloadIntoTransaction | null;
             performanceTracking: import("@atlaskit/editor-common/types").PerformanceTracking | undefined;
         };
-        dependencies: [import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
+        dependencies: [import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
             pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
             sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
-        }, import("@atlaskit/editor-common/types").FeatureFlags>];
+        }, import("@atlaskit/editor-common/types").FeatureFlags>>];
         actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
     }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>, import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"editorDisabled", {
         sharedState: import("@atlaskit/editor-plugin-editor-disabled").EditorDisabledPluginState;

package/dist/types-ts4.5/actions.d.ts

@@ -1,9 +1,7 @@
 import type { Command, CommandDispatch, ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorState, Transaction } from '@atlaskit/editor-prosemirror/state';
 import type { DatePlugin, DateType } from './types';
-export declare const createDate: (isQuickInsertAction?: boolean) => (insert: (node: Node | Object | string, opts?: {
-    selectInlineNode: boolean;
-}) => Transaction, state: EditorState) => Transaction;
+export declare const createDate: (isQuickInsertAction?: boolean) => (state: EditorState) => Transaction;
 /** Focus input */
 export declare const focusDateInput: () => (state: EditorState, dispatch: CommandDispatch | undefined) => boolean;
 export declare const setDatePickerAt: (showDatePickerAt: number | null) => (state: EditorState, dispatch: (tr: Transaction) => void) => boolean;
@@ -22,10 +20,10 @@ export declare const closeDatePickerWithAnalytics: ({ date, pluginInjectionApi,
                         performanceTracking: import("@atlaskit/editor-common/types").PerformanceTracking | undefined;
                     };
                     dependencies: [
-                        import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
+                        import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
                             pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
                             sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
-                        }, import("@atlaskit/editor-common/types").FeatureFlags>
+                        }, import("@atlaskit/editor-common/types").FeatureFlags>>
                     ];
                     actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
                 }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>,
@@ -47,10 +45,10 @@ export declare const closeDatePickerWithAnalytics: ({ date, pluginInjectionApi,
                 performanceTracking: import("@atlaskit/editor-common/types").PerformanceTracking | undefined;
             };
             dependencies: [
-                import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
+                import("@atlaskit/editor-common/types").OptionalPlugin<import("@atlaskit/editor-common/types").NextEditorPluginFunctionOptionalConfigDefinition<"featureFlags", {
                     pluginConfiguration: import("@atlaskit/editor-common/types").FeatureFlags;
                     sharedState: import("@atlaskit/editor-common/types").FeatureFlags;
-                }, import("@atlaskit/editor-common/types").FeatureFlags>
+                }, import("@atlaskit/editor-common/types").FeatureFlags>>
             ];
             actions: import("@atlaskit/editor-common/analytics").EditorAnalyticsAPI;
         }, import("@atlaskit/editor-plugin-analytics").AnalyticsPluginOptions>,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-date",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "description": "Date plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -34,7 +34,7 @@
     "@atlaskit/adf-schema": "^34.0.0",
     "@atlaskit/calendar": "^14.0.0",
     "@atlaskit/date": "^0.10.0",
-    "@atlaskit/editor-common": "^76.22.0",
+    "@atlaskit/editor-common": "^76.23.0",
     "@atlaskit/editor-plugin-analytics": "^0.3.0",
     "@atlaskit/editor-plugin-editor-disabled": "^0.2.0",
     "@atlaskit/editor-prosemirror": "1.1.0",
@@ -43,7 +43,7 @@
     "@atlaskit/locale": "^2.6.0",
     "@atlaskit/textfield": "6.0.0",
     "@atlaskit/theme": "^12.6.0",
-    "@atlaskit/tokens": "^1.28.0",
+    "@atlaskit/tokens": "^1.29.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",
     "date-fns": "^2.17.0",
@@ -59,7 +59,7 @@
     "@atlaskit/editor-plugin-guideline": "^0.5.0",
     "@atlaskit/editor-plugin-quick-insert": "^0.2.0",
     "@atlaskit/editor-plugin-selection": "^0.1.0",
-    "@atlaskit/editor-plugin-table": "^5.2.0",
+    "@atlaskit/editor-plugin-table": "^5.4.0",
     "@atlaskit/editor-plugin-tasks-and-decisions": "^0.2.0",
     "@atlaskit/editor-plugin-type-ahead": "^0.7.0",
     "@atlaskit/editor-plugin-width": "^0.2.0",