@atlaskit/editor-core 189.3.13 → 189.3.15

package/dist/types-ts4.5/plugins/find-replace/index.d.ts

@@ -1,13 +1,16 @@
-import type { NextEditorPlugin } from '@atlaskit/editor-common/types';
+import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { FeatureFlagsPlugin } from '@atlaskit/editor-plugin-feature-flags';
+import type { AnalyticsPlugin } from '@atlaskit/editor-plugin-analytics';
 type Config = {
     takeFullWidth: boolean;
     twoLineEditorToolbar: boolean;
 };
-export declare const findReplacePlugin: NextEditorPlugin<'findReplace', {
+export type FindReplacePlugin = NextEditorPlugin<'findReplace', {
     pluginConfiguration: Config;
     dependencies: [
-        FeatureFlagsPlugin
+        FeatureFlagsPlugin,
+        OptionalPlugin<AnalyticsPlugin>
     ];
 }>;
+export declare const findReplacePlugin: FindReplacePlugin;
 export default findReplacePlugin;

package/dist/types-ts4.5/plugins/find-replace/keymap.d.ts

@@ -1,3 +1,4 @@
 import type { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
-declare const keymapPlugin: () => SafePlugin<any>;
+import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
+declare const keymapPlugin: (editorAnalyticsAPI: EditorAnalyticsAPI | undefined) => SafePlugin<any>;
 export default keymapPlugin;

package/dist/types-ts4.5/plugins/index.d.ts

@@ -5,7 +5,6 @@ export { default as insertBlockPlugin } from './insert-block';
 export { default as jiraIssuePlugin } from './jira-issue';
 export { default as toolbarListsIndentationPlugin } from './toolbar-lists-indentation';
 export { default as macroPlugin } from './macro';
-export { default as maxContentSizePlugin } from './max-content-size';
 export { default as pastePlugin } from './paste';
 export { default as tasksAndDecisionsPlugin } from './tasks-and-decisions';
 export { default as breakoutPlugin } from './breakout';
@@ -16,7 +15,6 @@ export { default as annotationPlugin } from './annotation';
 export { default as analyticsPlugin } from './analytics';
 export { default as customAutoformatPlugin } from './custom-autoformat';
 export { default as feedbackDialogPlugin } from './feedback-dialog';
-export { default as expandPlugin, isExpandInsertionEnabled } from './expand';
 export { default as mobileDimensionsPlugin } from './mobile-dimensions';
 export { default as findReplacePlugin } from './find-replace';
 export { default as mobileSelectionPlugin } from './mobile-selection';

package/dist/types-ts4.5/plugins/insert-block/types.d.ts

@@ -17,7 +17,7 @@ import type { TypeAheadPlugin } from '@atlaskit/editor-plugin-type-ahead';
 import type { MentionsPlugin } from '@atlaskit/editor-plugin-mentions';
 import type { StatusPlugin } from '@atlaskit/editor-plugin-status';
 import type { PlaceholderTextPlugin } from '@atlaskit/editor-plugin-placeholder-text';
-import type { ExpandPlugin } from '../expand';
+import type { ExpandPlugin } from '@atlaskit/editor-plugin-expand';
 export type InsertBlockPluginDependencies = [
     FeatureFlagsPlugin,
     TypeAheadPlugin,

package/dist/types-ts4.5/plugins/mobile-dimensions/index.d.ts

@@ -1,3 +1,7 @@
 import type { NextEditorPlugin } from '@atlaskit/editor-common/types';
-declare const mobileDimensionsPlugin: NextEditorPlugin<'mobileDimensions'>;
+import type { MobileDimensionsPluginState } from './types';
+export type MobileDimensionsPlugin = NextEditorPlugin<'mobileDimensions', {
+    sharedState: MobileDimensionsPluginState | undefined;
+}>;
+declare const mobileDimensionsPlugin: MobileDimensionsPlugin;
 export default mobileDimensionsPlugin;

package/dist/types-ts4.5/presets/context.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { PublicPluginAPI } from '@atlaskit/editor-common/types';
+import type { PublicPluginAPI, NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 export type SetEditorAPI = (editorApi: PublicPluginAPI<any>) => void;
 export interface EditorAPIContextType {
     editorApi?: PublicPluginAPI<any>;
@@ -10,6 +10,6 @@ interface EditorAPIProviderProps {
     children: React.ReactNode;
 }
 export declare const PresetContextProvider: ({ children }: EditorAPIProviderProps) => JSX.Element;
-export declare const usePresetContext: () => PublicPluginAPI<any> | undefined;
+export declare function usePresetContext<Plugins extends OptionalPlugin<NextEditorPlugin<any, any>>[]>(): PublicPluginAPI<Plugins>;
 export declare const useSetPresetContext: () => SetEditorAPI | undefined;
 export {};

package/dist/types-ts4.5/presets/universal.d.ts

@@ -1,5 +1,6 @@
 import type { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next';
 import type { EditorAppearance } from '@atlaskit/editor-common/types';
+import type { EditorProps } from '../types';
 import type { DefaultPresetPluginOptions } from './default';
 import type { EditorPresetProps } from './types';
 import type { EditorSharedPropsWithPlugins, EditorPluginFeatureProps, EditorProviderProps } from '../types/editor-props';
@@ -18,4 +19,8 @@ type UniversalPresetProps = EditorPresetProps & DefaultPresetPluginOptions & Edi
  * @returns a full featured preset configured according to the provided props - basis for create-plugins-list
  */
 export default function createUniversalPreset(appearance: EditorAppearance | undefined, props: UniversalPresetProps, featureFlags: FeatureFlags, prevAppearance?: EditorAppearance, createAnalyticsEvent?: CreateUIAnalyticsEvent): EditorPresetBuilder<any, any>;
+interface ExpandEditorProps {
+    allowExpand?: EditorProps['allowExpand'];
+}
+export declare function isExpandInsertionEnabled({ allowExpand }: ExpandEditorProps): boolean;
 export {};

package/dist/types-ts4.5/ui/Appearance/Chromeless.d.ts

@@ -1,7 +1,7 @@
 /** @jsx jsx */
 import React from 'react';
 import { jsx } from '@emotion/react';
-import { EditorAppearanceComponentProps } from '../../types';
+import type { EditorAppearanceComponentProps } from '../../types';
 export default class Editor extends React.Component<EditorAppearanceComponentProps, any> {
     static displayName: string;
     private appearance;

package/dist/types-ts4.5/{plugins/expand/ui/styles.d.ts → ui/ContentStyles/expand.d.ts}

@@ -1,2 +1,2 @@
-import { ThemeProps } from '@atlaskit/theme/types';
+import type { ThemeProps } from '@atlaskit/theme/types';
 export declare const expandStyles: (props: ThemeProps) => import("@emotion/react").SerializedStyles;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "189.3.13",
+  "version": "189.3.15",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -73,6 +73,7 @@
     "@atlaskit/editor-plugin-decorations": "^0.2.0",
     "@atlaskit/editor-plugin-editor-disabled": "^0.2.0",
     "@atlaskit/editor-plugin-emoji": "^0.4.0",
+    "@atlaskit/editor-plugin-expand": "^0.1.0",
     "@atlaskit/editor-plugin-extension": "^0.2.0",
     "@atlaskit/editor-plugin-feature-flags": "^1.0.0",
     "@atlaskit/editor-plugin-floating-toolbar": "^0.7.0",
@@ -86,6 +87,7 @@
     "@atlaskit/editor-plugin-image-upload": "^0.2.0",
     "@atlaskit/editor-plugin-layout": "^0.1.0",
     "@atlaskit/editor-plugin-list": "^1.3.0",
+    "@atlaskit/editor-plugin-max-content-size": "^0.1.0",
     "@atlaskit/editor-plugin-media": "^0.3.0",
     "@atlaskit/editor-plugin-mentions": "^0.1.0",
     "@atlaskit/editor-plugin-panel": "^0.1.0",
@@ -136,6 +138,7 @@
     "@atlaskit/toggle": "^12.6.0",
     "@atlaskit/tokens": "^1.28.0",
     "@atlaskit/tooltip": "^17.8.0",
+    "@atlaskit/ufo": "^0.2.0",
     "@atlaskit/width-detector": "^4.1.0",
     "@babel/runtime": "^7.0.0",
     "@emotion/react": "^11.7.1",
@@ -149,8 +152,7 @@
     "raf-schd": "^4.0.3",
     "react-loadable": "^5.1.0",
     "react-transition-group": "^4.4.1",
-    "uuid": "^3.1.0",
-    "w3c-keyname": "^2.1.0"
+    "uuid": "^3.1.0"
   },
   "peerDependencies": {
     "@atlaskit/link-provider": "^1.6.2",
@@ -166,7 +168,7 @@
     "@atlaskit/collab-provider": "9.15.4",
     "@atlaskit/dropdown-menu": "^12.1.0",
     "@atlaskit/editor-extension-dropbox": "^0.4.0",
-    "@atlaskit/editor-palette": "1.5.1",
+    "@atlaskit/editor-palette": "1.5.2",
     "@atlaskit/flag": "^15.2.0",
     "@atlaskit/icon-object": "^6.3.0",
     "@atlaskit/inline-dialog": "^14.0.0",
@@ -180,7 +182,6 @@
     "@atlaskit/modal-dialog": "^12.8.0",
     "@atlaskit/renderer": "^108.15.0",
     "@atlaskit/synchrony-test-helpers": "^2.3.0",
-    "@atlaskit/ufo": "^0.2.0",
     "@atlaskit/util-data-test": "^17.8.0",
     "@atlaskit/visual-regression": "*",
     "@atlaskit/webdriver-runner": "*",
@@ -245,10 +246,6 @@
       "type": "boolean",
       "referenceOnly": "true"
     },
-    "platform.editor.update-table-cell-width-via-step": {
-      "type": "boolean",
-      "referenceOnly": "true"
-    },
     "platform.editor.table-remove-update-resize-handles_djvab": {
       "type": "boolean",
       "referenceOnly": "true"

package/dist/cjs/plugins/breakout/constants.js

@@ -1,10 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.BreakoutCssClassName = void 0;
-var BreakoutCssClassName = exports.BreakoutCssClassName = {
-  BREAKOUT_MARK: 'fabric-editor-breakout-mark',
-  BREAKOUT_MARK_DOM: 'fabric-editor-breakout-mark-dom'
-};

package/dist/cjs/plugins/expand/commands.js

@@ -1,184 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.updateExpandTitle = exports.toggleExpandExpanded = exports.setSelectionInsideExpand = exports.setExpandRef = exports.insertExpand = exports.focusTitle = exports.deleteExpandAtPos = exports.deleteExpand = exports.createExpandNode = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _state = require("@atlaskit/editor-prosemirror/state");
-var _utils = require("@atlaskit/editor-tables/utils");
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _selection = require("@atlaskit/editor-common/selection");
-var _utils2 = require("./utils");
-var _pluginFactory = require("./pm-plugins/plugin-factory");
-var _utils3 = require("@atlaskit/editor-common/utils");
-var _utils4 = require("@atlaskit/editor-prosemirror/utils");
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var setExpandRef = exports.setExpandRef = function setExpandRef(ref) {
-  return (0, _pluginFactory.createCommand)({
-    type: 'SET_EXPAND_REF',
-    data: {
-      ref: ref
-    }
-  }, function (tr) {
-    return tr.setMeta('addToHistory', false);
-  });
-};
-var deleteExpandAtPos = exports.deleteExpandAtPos = function deleteExpandAtPos(editorAnalyticsAPI) {
-  return function (expandNodePos, expandNode) {
-    return function (state, dispatch) {
-      if (!expandNode || isNaN(expandNodePos)) {
-        return false;
-      }
-      var payload = {
-        action: _analytics.ACTION.DELETED,
-        actionSubject: expandNode.type === state.schema.nodes.expand ? _analytics.ACTION_SUBJECT.EXPAND : _analytics.ACTION_SUBJECT.NESTED_EXPAND,
-        attributes: {
-          inputMethod: _analytics.INPUT_METHOD.TOOLBAR
-        },
-        eventType: _analytics.EVENT_TYPE.TRACK
-      };
-      if (expandNode && dispatch) {
-        var tr = state.tr;
-        tr.delete(expandNodePos, expandNodePos + expandNode.nodeSize);
-        editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
-        dispatch(tr);
-      }
-      return true;
-    };
-  };
-};
-var deleteExpand = exports.deleteExpand = function deleteExpand(editorAnalyticsAPI) {
-  return function (state, dispatch) {
-    var expandNode = (0, _utils2.findExpand)(state);
-    if (!expandNode) {
-      return false;
-    }
-    return deleteExpandAtPos(editorAnalyticsAPI)(expandNode.pos, expandNode.node)(state, dispatch);
-  };
-};
-var updateExpandTitle = exports.updateExpandTitle = function updateExpandTitle(title, pos, nodeType) {
-  return function (state, dispatch) {
-    var node = state.doc.nodeAt(pos);
-    if (node && node.type === nodeType && dispatch) {
-      var tr = state.tr;
-      tr.setNodeMarkup(pos, node.type, _objectSpread(_objectSpread({}, node.attrs), {}, {
-        title: title
-      }), node.marks);
-      dispatch(tr);
-    }
-    return true;
-  };
-};
-var toggleExpandExpanded = exports.toggleExpandExpanded = function toggleExpandExpanded(editorAnalyticsAPI) {
-  return function (pos, nodeType) {
-    return function (state, dispatch) {
-      var node = state.doc.nodeAt(pos);
-      if (node && node.type === nodeType && dispatch) {
-        var tr = state.tr;
-        var isExpandedNext = !node.attrs.__expanded;
-        tr.setNodeMarkup(pos, node.type, _objectSpread(_objectSpread({}, node.attrs), {}, {
-          __expanded: isExpandedNext
-        }), node.marks);
-
-        // If we're going to collapse the expand and our cursor is currently inside
-        // Move to a right gap cursor, if the toolbar is interacted (or an API),
-        // it will insert below rather than inside (which will be invisible).
-        if (isExpandedNext === false && (0, _utils2.findExpand)(state)) {
-          tr.setSelection(new _selection.GapCursorSelection(tr.doc.resolve(pos + node.nodeSize), _selection.Side.RIGHT));
-        }
-
-        // log when people open/close expands
-        // TODO: ED-8523 make platform/mode global attributes?
-        var payload = {
-          action: _analytics.ACTION.TOGGLE_EXPAND,
-          actionSubject: nodeType === state.schema.nodes.expand ? _analytics.ACTION_SUBJECT.EXPAND : _analytics.ACTION_SUBJECT.NESTED_EXPAND,
-          attributes: {
-            platform: _analytics.PLATFORMS.WEB,
-            mode: _analytics.MODE.EDITOR,
-            expanded: isExpandedNext
-          },
-          eventType: _analytics.EVENT_TYPE.TRACK
-        };
-
-        // `isRemote` meta prevents this step from being
-        // sync'd between sessions in collab edit
-        tr.setMeta('isRemote', true);
-        editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
-        dispatch(tr);
-      }
-      return true;
-    };
-  };
-};
-
-// Creates either an expand or a nestedExpand node based on the current selection
-var createExpandNode = exports.createExpandNode = function createExpandNode(state) {
-  var _state$schema$nodes = state.schema.nodes,
-    expand = _state$schema$nodes.expand,
-    nestedExpand = _state$schema$nodes.nestedExpand;
-  var expandType = (0, _utils.findTable)(state.selection) ? nestedExpand : expand;
-  return expandType.createAndFill({});
-};
-var insertExpand = exports.insertExpand = function insertExpand(editorAnalyticsAPI) {
-  return function (state, dispatch) {
-    var expandNode = createExpandNode(state);
-    if (!expandNode) {
-      return false;
-    }
-    var tr = state.selection.empty ? (0, _utils4.safeInsert)(expandNode)(state.tr).scrollIntoView() : (0, _utils3.createWrapSelectionTransaction)({
-      state: state,
-      type: expandNode.type
-    });
-    var payload = {
-      action: _analytics.ACTION.INSERTED,
-      actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-      actionSubjectId: (expandNode === null || expandNode === void 0 ? void 0 : expandNode.type) === state.schema.nodes.expand ? _analytics.ACTION_SUBJECT_ID.EXPAND : _analytics.ACTION_SUBJECT_ID.NESTED_EXPAND,
-      attributes: {
-        inputMethod: _analytics.INPUT_METHOD.INSERT_MENU
-      },
-      eventType: _analytics.EVENT_TYPE.TRACK
-    };
-    if (dispatch && expandNode) {
-      editorAnalyticsAPI === null || editorAnalyticsAPI === void 0 || editorAnalyticsAPI.attachAnalyticsEvent(payload)(tr);
-      dispatch(tr);
-    }
-    return true;
-  };
-};
-var focusTitle = exports.focusTitle = function focusTitle(pos) {
-  return function (state, dispatch, editorView) {
-    if (editorView) {
-      var dom = editorView.domAtPos(pos);
-      var expandWrapper = dom.node.parentElement;
-      if (expandWrapper) {
-        setSelectionInsideExpand(pos)(state, dispatch, editorView);
-        var input = expandWrapper.querySelector('input');
-        if (input) {
-          input.focus();
-          return true;
-        }
-      }
-    }
-    return false;
-  };
-};
-
-// Used to clear any node or cell selection when expand title is focused
-var setSelectionInsideExpand = exports.setSelectionInsideExpand = function setSelectionInsideExpand(expandPos) {
-  return function (state, dispatch, editorView) {
-    if (editorView) {
-      if (!editorView.hasFocus()) {
-        editorView.focus();
-      }
-      var sel = _state.Selection.findFrom(editorView.state.doc.resolve(expandPos), 1, true);
-      if (sel && dispatch) {
-        dispatch(editorView.state.tr.setSelection(sel));
-      }
-      return true;
-    }
-    return false;
-  };
-};

package/dist/cjs/plugins/expand/index.js

@@ -1,111 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-exports.isExpandInsertionEnabled = isExpandInsertionEnabled;
-Object.defineProperty(exports, "pluginKey", {
-  enumerable: true,
-  get: function get() {
-    return _pluginFactory.pluginKey;
-  }
-});
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-var _react = _interopRequireDefault(require("react"));
-var _adfSchema = require("@atlaskit/adf-schema");
-var _main = require("./pm-plugins/main");
-var _keymap = require("./pm-plugins/keymap");
-var _quickInsert = require("@atlaskit/editor-common/quick-insert");
-var _analytics = require("@atlaskit/editor-common/analytics");
-var _toolbar = require("./toolbar");
-var _commands = require("./commands");
-var _messages = require("@atlaskit/editor-common/messages");
-var _utils = require("@atlaskit/editor-common/utils");
-var _pluginFactory = require("./pm-plugins/plugin-factory");
-var expandPlugin = function expandPlugin(_ref) {
-  var _api$featureFlags, _api$analytics;
-  var _ref$config = _ref.config,
-    options = _ref$config === void 0 ? {} : _ref$config,
-    api = _ref.api;
-  var featureFlags = (api === null || api === void 0 || (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.sharedState.currentState()) || {};
-  return {
-    name: 'expand',
-    nodes: function nodes() {
-      return [{
-        name: 'expand',
-        node: _adfSchema.expand
-      }, {
-        name: 'nestedExpand',
-        node: _adfSchema.nestedExpand
-      }];
-    },
-    actions: {
-      insertExpand: (0, _commands.insertExpand)(api === null || api === void 0 || (_api$analytics = api.analytics) === null || _api$analytics === void 0 ? void 0 : _api$analytics.actions)
-    },
-    pmPlugins: function pmPlugins() {
-      return [{
-        name: 'expand',
-        plugin: function plugin(_ref2) {
-          var dispatch = _ref2.dispatch,
-            getIntl = _ref2.getIntl;
-          return (0, _main.createPlugin)(dispatch, getIntl, options.appearance, options.useLongPressSelection, featureFlags, api);
-        }
-      }, {
-        name: 'expandKeymap',
-        plugin: function plugin() {
-          return (0, _keymap.expandKeymap)(api);
-        }
-      }];
-    },
-    pluginsOptions: {
-      floatingToolbar: (0, _toolbar.getToolbarConfig)(api),
-      quickInsert: function quickInsert(_ref3) {
-        var formatMessage = _ref3.formatMessage;
-        if (options && options.allowInsertion !== true) {
-          return [];
-        }
-        return [{
-          id: 'expand',
-          title: formatMessage(_messages.toolbarInsertBlockMessages.expand),
-          description: formatMessage(_messages.toolbarInsertBlockMessages.expandDescription),
-          keywords: ['accordion', 'collapse'],
-          priority: 600,
-          icon: function icon() {
-            return /*#__PURE__*/_react.default.createElement(_quickInsert.IconExpand, null);
-          },
-          action: function action(insert, state) {
-            var _api$analytics2;
-            var node = (0, _commands.createExpandNode)(state);
-            if (!node) {
-              return false;
-            }
-            var tr = state.selection.empty ? insert(node) : (0, _utils.createWrapSelectionTransaction)({
-              state: state,
-              type: node.type
-            });
-            api === null || api === void 0 || (_api$analytics2 = api.analytics) === null || _api$analytics2 === void 0 || _api$analytics2.actions.attachAnalyticsEvent({
-              action: _analytics.ACTION.INSERTED,
-              actionSubject: _analytics.ACTION_SUBJECT.DOCUMENT,
-              actionSubjectId: node.type === state.schema.nodes.nestedExpand ? _analytics.ACTION_SUBJECT_ID.NESTED_EXPAND : _analytics.ACTION_SUBJECT_ID.EXPAND,
-              attributes: {
-                inputMethod: _analytics.INPUT_METHOD.QUICK_INSERT
-              },
-              eventType: _analytics.EVENT_TYPE.TRACK
-            })(tr);
-            return tr;
-          }
-        }];
-      }
-    }
-  };
-};
-var _default = exports.default = expandPlugin;
-function isExpandInsertionEnabled(_ref4) {
-  var allowExpand = _ref4.allowExpand;
-  if (allowExpand && (0, _typeof2.default)(allowExpand) === 'object') {
-    return !!allowExpand.allowInsertion;
-  }
-  return false;
-}