@atlaskit/editor-plugin-selection 1.2.0 → 1.2.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/editor-plugin-selection
 
+## 1.2.1
+
+### Patch Changes
+
+- [#92552](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/92552) [`7cd874b858c8`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/7cd874b858c8) - Check target elements are actually HTMLElement rather than typecasting.
+
 ## 1.2.0
 
 ### Minor Changes

package/dist/cjs/gap-cursor/utils.js

@@ -89,12 +89,12 @@ function getLayoutModeFromTargetNode(node) {
   return layout;
 }
 var isIgnoredClick = exports.isIgnoredClick = function isIgnoredClick(elem) {
-  if (elem.nodeName === 'BUTTON' || elem.closest('button')) {
+  if ((elem === null || elem === void 0 ? void 0 : elem.nodeName) === 'BUTTON' || elem !== null && elem !== void 0 && elem.closest('button')) {
     return true;
   }
 
   // check if we're clicking an image caption placeholder
-  if (elem.closest("[data-id=\"".concat(_mediaSingle.CAPTION_PLACEHOLDER_ID, "\"]"))) {
+  if (elem !== null && elem !== void 0 && elem.closest("[data-id=\"".concat(_mediaSingle.CAPTION_PLACEHOLDER_ID, "\"]"))) {
     return true;
   }
 
@@ -116,7 +116,7 @@ var isIgnoredClick = exports.isIgnoredClick = function isIgnoredClick(elem) {
 
   // Check if unsupported node selection
   // (without this, selection requires double clicking in FF due to posAtCoords differences)
-  if (elem.closest(".".concat(_styles.UnsupportedSharedCssClassName.BLOCK_CONTAINER))) {
+  if (elem !== null && elem !== void 0 && elem.closest(".".concat(_styles.UnsupportedSharedCssClassName.BLOCK_CONTAINER))) {
     return true;
   }
   return false;

package/dist/cjs/pm-plugins/gap-cursor-main.js

@@ -10,6 +10,7 @@ var _state = require("@atlaskit/editor-prosemirror/state");
 var _utils = require("@atlaskit/editor-prosemirror/utils");
 var _view2 = require("@atlaskit/editor-prosemirror/view");
 var _cellSelection = require("@atlaskit/editor-tables/cell-selection");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _actions = require("../gap-cursor/actions");
 var _direction = require("../gap-cursor/direction");
 var _utils2 = require("../gap-cursor/utils");
@@ -112,8 +113,14 @@ var plugin = new _safePlugin.SafePlugin({
         left: event.clientX,
         top: event.clientY
       });
-      if (!posAtCoords || (0, _utils2.isIgnoredClick)(event.target)) {
-        return false;
+      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.explicit-html-element-check')) {
+        if (!posAtCoords || (0, _utils2.isIgnoredClick)(event.target instanceof HTMLElement ? event.target : null)) {
+          return false;
+        }
+      } else {
+        if (!posAtCoords || (0, _utils2.isIgnoredClick)(event.target)) {
+          return false;
+        }
       }
       var isInsideTheTarget = posAtCoords.pos === posAtCoords.inside;
       if (isInsideTheTarget) {

package/dist/es2019/gap-cursor/utils.js

@@ -76,12 +76,12 @@ export function getLayoutModeFromTargetNode(node) {
   return layout;
 }
 export const isIgnoredClick = elem => {
-  if (elem.nodeName === 'BUTTON' || elem.closest('button')) {
+  if ((elem === null || elem === void 0 ? void 0 : elem.nodeName) === 'BUTTON' || elem !== null && elem !== void 0 && elem.closest('button')) {
     return true;
   }
 
   // check if we're clicking an image caption placeholder
-  if (elem.closest(`[data-id="${CAPTION_PLACEHOLDER_ID}"]`)) {
+  if (elem !== null && elem !== void 0 && elem.closest(`[data-id="${CAPTION_PLACEHOLDER_ID}"]`)) {
     return true;
   }
 
@@ -103,7 +103,7 @@ export const isIgnoredClick = elem => {
 
   // Check if unsupported node selection
   // (without this, selection requires double clicking in FF due to posAtCoords differences)
-  if (elem.closest(`.${UnsupportedSharedCssClassName.BLOCK_CONTAINER}`)) {
+  if (elem !== null && elem !== void 0 && elem.closest(`.${UnsupportedSharedCssClassName.BLOCK_CONTAINER}`)) {
     return true;
   }
   return false;

package/dist/es2019/pm-plugins/gap-cursor-main.js

@@ -4,6 +4,7 @@ import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findPositionOfNodeBefore } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { deleteNode } from '../gap-cursor/actions';
 import { Direction } from '../gap-cursor/direction';
 import { getLayoutModeFromTargetNode, isIgnoredClick } from '../gap-cursor/utils';
@@ -110,8 +111,14 @@ const plugin = new SafePlugin({
         left: event.clientX,
         top: event.clientY
       });
-      if (!posAtCoords || isIgnoredClick(event.target)) {
-        return false;
+      if (getBooleanFF('platform.editor.explicit-html-element-check')) {
+        if (!posAtCoords || isIgnoredClick(event.target instanceof HTMLElement ? event.target : null)) {
+          return false;
+        }
+      } else {
+        if (!posAtCoords || isIgnoredClick(event.target)) {
+          return false;
+        }
       }
       const isInsideTheTarget = posAtCoords.pos === posAtCoords.inside;
       if (isInsideTheTarget) {

package/dist/esm/gap-cursor/utils.js

@@ -80,12 +80,12 @@ export function getLayoutModeFromTargetNode(node) {
   return layout;
 }
 export var isIgnoredClick = function isIgnoredClick(elem) {
-  if (elem.nodeName === 'BUTTON' || elem.closest('button')) {
+  if ((elem === null || elem === void 0 ? void 0 : elem.nodeName) === 'BUTTON' || elem !== null && elem !== void 0 && elem.closest('button')) {
     return true;
   }
 
   // check if we're clicking an image caption placeholder
-  if (elem.closest("[data-id=\"".concat(CAPTION_PLACEHOLDER_ID, "\"]"))) {
+  if (elem !== null && elem !== void 0 && elem.closest("[data-id=\"".concat(CAPTION_PLACEHOLDER_ID, "\"]"))) {
     return true;
   }
 
@@ -107,7 +107,7 @@ export var isIgnoredClick = function isIgnoredClick(elem) {
 
   // Check if unsupported node selection
   // (without this, selection requires double clicking in FF due to posAtCoords differences)
-  if (elem.closest(".".concat(UnsupportedSharedCssClassName.BLOCK_CONTAINER))) {
+  if (elem !== null && elem !== void 0 && elem.closest(".".concat(UnsupportedSharedCssClassName.BLOCK_CONTAINER))) {
     return true;
   }
   return false;

package/dist/esm/pm-plugins/gap-cursor-main.js

@@ -4,6 +4,7 @@ import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { findPositionOfNodeBefore } from '@atlaskit/editor-prosemirror/utils';
 import { Decoration, DecorationSet } from '@atlaskit/editor-prosemirror/view';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { deleteNode } from '../gap-cursor/actions';
 import { Direction } from '../gap-cursor/direction';
 import { getLayoutModeFromTargetNode, isIgnoredClick } from '../gap-cursor/utils';
@@ -106,8 +107,14 @@ var plugin = new SafePlugin({
         left: event.clientX,
         top: event.clientY
       });
-      if (!posAtCoords || isIgnoredClick(event.target)) {
-        return false;
+      if (getBooleanFF('platform.editor.explicit-html-element-check')) {
+        if (!posAtCoords || isIgnoredClick(event.target instanceof HTMLElement ? event.target : null)) {
+          return false;
+        }
+      } else {
+        if (!posAtCoords || isIgnoredClick(event.target)) {
+          return false;
+        }
       }
       var isInsideTheTarget = posAtCoords.pos === posAtCoords.inside;
       if (isInsideTheTarget) {

package/dist/types/gap-cursor/utils.d.ts

@@ -4,5 +4,5 @@ export declare const isLeftCursor: (side: Side) => side is Side.LEFT;
 export declare function getMediaNearPos(doc: PMNode, $pos: ResolvedPos, schema: Schema, dir?: number): PMNode | null;
 export declare const isTextBlockNearPos: (doc: PMNode, schema: Schema, $pos: ResolvedPos, dir: number) => boolean;
 export declare function getLayoutModeFromTargetNode(node: PMNode): string;
-export declare const isIgnoredClick: (elem: HTMLElement) => boolean;
+export declare const isIgnoredClick: (elem: HTMLElement | null) => boolean | null;
 export declare const getComputedStyleForLayoutMode: (dom: HTMLElement, node: PMNode | undefined | null, style: CSSStyleDeclaration) => CSSStyleDeclaration;

package/dist/types-ts4.5/gap-cursor/utils.d.ts

@@ -4,5 +4,5 @@ export declare const isLeftCursor: (side: Side) => side is Side.LEFT;
 export declare function getMediaNearPos(doc: PMNode, $pos: ResolvedPos, schema: Schema, dir?: number): PMNode | null;
 export declare const isTextBlockNearPos: (doc: PMNode, schema: Schema, $pos: ResolvedPos, dir: number) => boolean;
 export declare function getLayoutModeFromTargetNode(node: PMNode): string;
-export declare const isIgnoredClick: (elem: HTMLElement) => boolean;
+export declare const isIgnoredClick: (elem: HTMLElement | null) => boolean | null;
 export declare const getComputedStyleForLayoutMode: (dom: HTMLElement, node: PMNode | undefined | null, style: CSSStyleDeclaration) => CSSStyleDeclaration;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-selection",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Selection plugin for @atlaskit/editor-core",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -21,9 +21,9 @@
     "runReact18": false
   },
   "dependencies": {
-    "@atlaskit/editor-common": "^78.31.0",
+    "@atlaskit/editor-common": "^78.33.0",
     "@atlaskit/editor-prosemirror": "4.0.0",
-    "@atlaskit/editor-shared-styles": "^2.9.0",
+    "@atlaskit/editor-shared-styles": "^2.10.0",
     "@atlaskit/editor-tables": "^2.7.0",
     "@atlaskit/platform-feature-flags": "^0.2.4",
     "@babel/runtime": "^7.0.0"
@@ -84,6 +84,9 @@
     },
     "platform.editor.single-player-expand": {
       "type": "boolean"
+    },
+    "platform.editor.explicit-html-element-check": {
+      "type": "boolean"
     }
   }
 }