@atlaskit/link-picker 1.6.1 → 1.7.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/link-picker
 
+## 1.7.0
+
+### Minor Changes
+
+- [`d0feee9b4ad`](https://bitbucket.org/atlassian/atlassian-frontend/commits/d0feee9b4ad) - [ux] Add a UI error message to display when the link picker plugin resolve throws an error
+
 ## 1.6.1
 
 ### Patch Changes

package/dist/cjs/services/use-plugins/index.js

@@ -19,8 +19,6 @@ var _react = require("react");
 
 var _linkPicker = require("../../ui/link-picker");
 
-var _url = require("../../ui/link-picker/url");
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -29,56 +27,46 @@ function reducer(state, payload) {
   return _objectSpread(_objectSpread({}, state), payload);
 }
 
-function usePlugins(state, plugins) {
+function usePlugins(state, activeTab, plugins) {
+  var _useState = (0, _react.useState)(0),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      retries = _useState2[0],
+      setRetries = _useState2[1];
+
   var _useReducer = (0, _react.useReducer)(reducer, {
-    items: [],
+    items: null,
+    error: null,
     isLoading: false
   }),
       _useReducer2 = (0, _slicedToArray2.default)(_useReducer, 2),
       pluginState = _useReducer2[0],
       dispatch = _useReducer2[1];
 
-  var url = state.url,
-      selectedIndex = state.selectedIndex;
   var items = pluginState.items,
-      isLoading = pluginState.isLoading;
-  var activePlugin = !plugins || plugins.length === 0 ? null : plugins[state.activeTab];
+      isLoading = pluginState.isLoading,
+      error = pluginState.error;
   var queryVersion = (0, _react.useRef)(0);
-  var pluginRef = (0, _react.useRef)(activePlugin);
-  var selectedItem = items[selectedIndex];
-  var isSelectedItem = (selectedItem === null || selectedItem === void 0 ? void 0 : selectedItem.url) === url;
+  var activePlugin = plugins === null || plugins === void 0 ? void 0 : plugins[activeTab];
   (0, _react.useEffect)(function () {
     if (!activePlugin) {
       return;
     }
 
-    if (isSelectedItem) {
-      return;
-    }
-
-    if ((0, _url.isSafeUrl)(url) && url.length) {
+    if (!state) {
       dispatch({
-        items: [],
-        isLoading: false
+        items: null,
+        isLoading: false,
+        error: null
       });
       return;
     }
 
-    var updates = activePlugin.resolve({
-      query: url
+    var updates = activePlugin.resolve(state);
+    dispatch({
+      items: null,
+      isLoading: true,
+      error: null
     });
-
-    if (pluginRef.current !== activePlugin) {
-      dispatch({
-        items: [],
-        isLoading: true
-      });
-    } else {
-      dispatch({
-        isLoading: true
-      });
-    }
-
     var newQuery = ++queryVersion.current;
 
     var updateResults = /*#__PURE__*/function () {
@@ -156,6 +144,8 @@ function usePlugins(state, plugins) {
                 _context.prev = 25;
                 _context.t0 = _context["catch"](0);
                 dispatch({
+                  error: _context.t0,
+                  items: null,
                   isLoading: false
                 });
 
@@ -173,7 +163,7 @@ function usePlugins(state, plugins) {
     }();
 
     updateResults();
-  }, [activePlugin, queryVersion, url, isSelectedItem]);
+  }, [activePlugin, queryVersion, state, retries]);
   var tabs = (0, _react.useMemo)(function () {
     if (!plugins || plugins.length <= 1) {
       return [];
@@ -187,12 +177,19 @@ function usePlugins(state, plugins) {
       };
     });
   }, [plugins]);
+  var handleRetry = (0, _react.useCallback)(function () {
+    setRetries(function (prev) {
+      return ++prev;
+    });
+  }, []);
   return {
     tabs: tabs,
     items: items,
     isLoading: isLoading,
-    isSelectedItem: isSelectedItem,
-    isActivePlugin: !!activePlugin
+    isActivePlugin: !!activePlugin,
+    error: error,
+    retry: handleRetry,
+    errorFallback: activePlugin === null || activePlugin === void 0 ? void 0 : activePlugin.errorFallback
   };
 }
 

package/dist/cjs/services/use-search-query/index.js

@@ -0,0 +1,41 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useSearchQuery = useSearchQuery;
+
+var _react = require("react");
+
+var _url = require("../../ui/link-picker/url");
+
+function useSearchQuery(state) {
+  var _queryState$current;
+
+  var queryState = (0, _react.useRef)(null);
+  /*
+   * When state contains a valid url AND is NOT selected from results
+   * queryState should be null to clear the items in plugin state
+   */
+
+  if ((0, _url.isSafeUrl)(state.url) && state.selectedIndex === -1) {
+    queryState.current = null;
+  }
+  /*
+   * When state contains a search term e.g. Not a valid url return a query
+   */
+
+
+  if (((_queryState$current = queryState.current) === null || _queryState$current === void 0 ? void 0 : _queryState$current.query) !== state.url && !(0, _url.isSafeUrl)(state.url)) {
+    queryState.current = {
+      query: state.url
+    };
+  }
+  /*
+   * When state contains a valid url and is selected from the list
+   * return current state to prevent triger a new plugin search
+   */
+
+
+  return queryState.current;
+}

package/dist/cjs/ui/error-boundary-fallback/index.js

@@ -13,7 +13,7 @@ var _emptyState = _interopRequireDefault(require("@atlaskit/empty-state"));
 
 var _reactIntlNext = require("react-intl-next");
 
-var _genericErrorSvg = _interopRequireDefault(require("./generic-error-svg"));
+var _genericErrorSvg = _interopRequireDefault(require("../../common/generic-error-svg"));
 
 var _styled = require("../link-picker/styled");
 

package/dist/cjs/ui/link-picker/index.js

@@ -7,7 +7,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.testIds = exports.default = exports.RECENT_SEARCH_LIST_SIZE = void 0;
+exports.testIds = exports.default = exports.RECENT_SEARCH_LIST_SIZE = exports.CONTACT_SUPPORT_LINK = void 0;
 
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 
@@ -31,6 +31,10 @@ var _tabs = _interopRequireWildcard(require("@atlaskit/tabs"));
 
 var _visuallyHidden = _interopRequireDefault(require("@atlaskit/visually-hidden"));
 
+var _usePlugins2 = require("../../services/use-plugins");
+
+var _useSearchQuery = require("../../services/use-search-query");
+
 var _messages = require("./messages");
 
 var _textInput = _interopRequireDefault(require("./text-input"));
@@ -43,13 +47,13 @@ var _styled = require("./styled");
 
 var _browser = require("./browser");
 
-var _transformTimeStamp = require("./transformTimeStamp");
-
 var _announcer = _interopRequireDefault(require("./announcer"));
 
 var _linkSearchNoResults = _interopRequireDefault(require("./link-search-no-results"));
 
-var _usePlugins2 = require("../../services/use-plugins");
+var _transformTimeStamp = require("./transformTimeStamp");
+
+var _linkSearchError = _interopRequireDefault(require("./link-search-error"));
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -61,6 +65,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 var RECENT_SEARCH_LIST_SIZE = 5;
 exports.RECENT_SEARCH_LIST_SIZE = RECENT_SEARCH_LIST_SIZE;
+var CONTACT_SUPPORT_LINK = 'https://support.atlassian.com/contact/';
+exports.CONTACT_SUPPORT_LINK = CONTACT_SUPPORT_LINK;
 var testIds = {
   linkPicker: 'link-picker',
   urlInputField: 'link-url',
@@ -76,7 +82,8 @@ var testIds = {
   searchResultLoadingIndicator: 'link-picker.results-loading-indicator',
   urlError: 'link-error',
   tabList: 'link-picker-tabs',
-  tabItem: 'link-picker-tab'
+  tabItem: 'link-picker-tab',
+  searchError: 'link-search-error'
 };
 exports.testIds = testIds;
 var initState = {
@@ -100,6 +107,8 @@ function reducer(state, payload) {
 }
 
 function LinkPicker(_ref) {
+  var _queryState$query, _items$length, _errorFallback;
+
   var onSubmit = _ref.onSubmit,
       onCancel = _ref.onCancel,
       onContentResize = _ref.onContentResize,
@@ -119,17 +128,23 @@ function LinkPicker(_ref) {
       selectedIndex = state.selectedIndex,
       url = state.url,
       displayText = state.displayText,
-      invalidUrl = state.invalidUrl;
-  var isEditing = !!initUrl;
+      invalidUrl = state.invalidUrl,
+      activeTab = state.activeTab;
   var intl = (0, _reactIntlNext.useIntl)();
+  var queryState = (0, _useSearchQuery.useSearchQuery)(state);
 
-  var _usePlugins = (0, _usePlugins2.usePlugins)(state, plugins),
+  var _usePlugins = (0, _usePlugins2.usePlugins)(queryState, activeTab, plugins),
       items = _usePlugins.items,
       isLoading = _usePlugins.isLoading,
-      isSelectedItem = _usePlugins.isSelectedItem,
       isActivePlugin = _usePlugins.isActivePlugin,
-      tabs = _usePlugins.tabs;
+      tabs = _usePlugins.tabs,
+      error = _usePlugins.error,
+      retry = _usePlugins.retry,
+      errorFallback = _usePlugins.errorFallback;
 
+  var isEditing = !!initUrl;
+  var selectedItem = items === null || items === void 0 ? void 0 : items[selectedIndex];
+  var isSelectedItem = (selectedItem === null || selectedItem === void 0 ? void 0 : selectedItem.url) === url;
   (0, _react.useLayoutEffect)(function () {
     if (onContentResize) {
       onContentResize();
@@ -183,15 +198,15 @@ function LinkPicker(_ref) {
     dispatch((0, _defineProperty2.default)({}, field, ''));
   }, []);
   var handleMouseEnterResultItem = (0, _react.useCallback)(function (objectId) {
-    var index = findIndex(items, function (item) {
+    var index = items === null || items === void 0 ? void 0 : items.findIndex(function (item) {
       return item.objectId === objectId;
     });
     dispatch({
-      activeIndex: index
+      activeIndex: index !== null && index !== void 0 ? index : -1
     });
   }, [items]);
   var handleMouseLeaveResultItem = (0, _react.useCallback)(function (objectId) {
-    var index = findIndex(items, function (item) {
+    var index = items === null || items === void 0 ? void 0 : items.findIndex(function (item) {
       return item.objectId === objectId;
     }); // This is to avoid updating index that was set by other mouseenter event
 
@@ -214,7 +229,7 @@ function LinkPicker(_ref) {
     } : {}));
   }, [displayText, onSubmit, state.url]);
   var handleSelected = (0, _react.useCallback)(function (objectId) {
-    var selectedItem = items.find(function (item) {
+    var selectedItem = items === null || items === void 0 ? void 0 : items.find(function (item) {
       return item.objectId === objectId;
     });
 
@@ -225,9 +240,7 @@ function LinkPicker(_ref) {
     }
   }, [handleInsert, items]);
   var handleSubmit = (0, _react.useCallback)(function () {
-    var selectedItem = items[selectedIndex];
-
-    if (isSelectedItem) {
+    if (isSelectedItem && selectedItem) {
       return handleInsert(selectedItem.url, selectedItem.name, 'typeAhead');
     }
 
@@ -240,18 +253,18 @@ function LinkPicker(_ref) {
     return dispatch({
       invalidUrl: true
     });
-  }, [handleInsert, isSelectedItem, items, selectedIndex, url]);
+  }, [handleInsert, isSelectedItem, selectedItem, url]);
   var linkPlaceHolder = isActivePlugin ? _messages.messages.placeholder : _messages.messages.linkPlaceholder;
-  var linkListTitle = url ? _messages.messages.titleResults : _messages.messages.titleRecentlyViewed;
+  var linkListTitle = (queryState === null || queryState === void 0 ? void 0 : (_queryState$query = queryState.query) === null || _queryState$query === void 0 ? void 0 : _queryState$query.length) !== 0 ? _messages.messages.titleResults : _messages.messages.titleRecentlyViewed;
   var insertButtonMsg = isEditing ? _messages.messages.saveButton : _messages.messages.insertButton;
-  var noResults = isActivePlugin && !isLoading && !items.length && !(0, _url2.isSafeUrl)(url);
+  var noResults = (items === null || items === void 0 ? void 0 : items.length) === 0 && !error;
   var screenReaderDescriptionId = 'search-recent-links-field-description';
   var linkSearchListId = 'link-picker-search-list';
   var ariaActiveDescendant = selectedIndex > -1 ? "link-search-list-item-".concat(selectedIndex) : ''; // Added workaround with a screen reader Announcer specifically for VoiceOver + Safari
   // as the Aria design pattern for combobox does not work in this case
   // for details: https://a11y-internal.atlassian.net/browse/AK-740
 
-  var screenReaderText = _browser.browser.safari && getScreenReaderText(items, selectedIndex, intl);
+  var screenReaderText = _browser.browser.safari && getScreenReaderText(items !== null && items !== void 0 ? items : [], selectedIndex, intl);
   var searchIcon = isActivePlugin && (0, _react2.jsx)("span", {
     css: _styled.searchIconStyles,
     "data-testid": testIds.searchIcon
@@ -303,7 +316,7 @@ function LinkPicker(_ref) {
     onSubmit: handleSubmit,
     onKeyDown: handleKeyDown,
     onChange: handleChangeText
-  }), tabs.length > 0 && (0, _react2.jsx)("div", {
+  }), queryState && (0, _react2.jsx)(_react.Fragment, null, tabs.length > 0 && (0, _react2.jsx)("div", {
     css: _styled.tabsWrapperStyles
   }, (0, _react2.jsx)(_tabs.default, {
     id: testIds.tabList,
@@ -321,7 +334,7 @@ function LinkPicker(_ref) {
       key: tab.tabTitle,
       testId: testIds.tabItem
     }, tab.tabTitle);
-  })))), !!items.length && (0, _react2.jsx)("div", {
+  })))), !!(items !== null && items !== void 0 && items.length) && (0, _react2.jsx)("div", {
     css: _styled.listTitleStyles,
     id: testIds.resultListTitle,
     "data-testid": testIds.resultListTitle
@@ -329,7 +342,7 @@ function LinkPicker(_ref) {
     id: "fabric.smartcard.linkpicker.suggested.results"
   }, url && (0, _react2.jsx)(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _messages.messages.searchLinkResults, {
     values: {
-      count: items.length
+      count: (_items$length = items === null || items === void 0 ? void 0 : items.length) !== null && _items$length !== void 0 ? _items$length : 0
     },
     "aria-live": "polite",
     "aria-atomic": "true"
@@ -338,18 +351,34 @@ function LinkPicker(_ref) {
     ariaControls: "fabric.smartcard.linkpicker.suggested.results",
     id: linkSearchListId,
     role: "listbox",
-    items: items,
+    items: items !== null && items !== void 0 ? items : [],
     isLoading: isLoading,
     selectedIndex: selectedIndex,
     activeIndex: activeIndex,
     onSelect: handleSelected,
     onMouseEnter: handleMouseEnterResultItem,
     onMouseLeave: handleMouseLeaveResultItem
-  }), noResults && (0, _react2.jsx)(_linkSearchNoResults.default, {
+  }), error && ((_errorFallback = errorFallback === null || errorFallback === void 0 ? void 0 : errorFallback(error, retry)) !== null && _errorFallback !== void 0 ? _errorFallback : (0, _react2.jsx)(_linkSearchError.default, {
+    testId: testIds.searchError,
+    header: intl.formatMessage(_messages.messages.searchErrorHeader),
+    description: (0, _react2.jsx)(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _messages.messages.searchErrorDescription, {
+      values: {
+        a: function a(label) {
+          return (0, _react2.jsx)(_button.default, {
+            appearance: "link",
+            spacing: "none",
+            href: CONTACT_SUPPORT_LINK,
+            target: "_blank",
+            rel: "noopener noreferrer"
+          }, label);
+        }
+      }
+    }))
+  })), noResults && (0, _react2.jsx)(_linkSearchNoResults.default, {
     testId: testIds.emptyResultPage,
     header: intl.formatMessage(_messages.messages.noResults),
     description: intl.formatMessage(_messages.messages.noResultsDescription)
-  }), (0, _react2.jsx)(_form.FormFooter, {
+  })), (0, _react2.jsx)(_form.FormFooter, {
     align: "end"
   }, (0, _react2.jsx)(_button.ButtonGroup, null, (0, _react2.jsx)(_button.default, {
     appearance: "default",
@@ -377,17 +406,4 @@ function getScreenReaderText(items, selectedIndex, intl) {
     var formattedDate = [date === null || date === void 0 ? void 0 : date.pageAction, date === null || date === void 0 ? void 0 : date.dateString, date === null || date === void 0 ? void 0 : date.timeSince].filter(Boolean).join(' ');
     return [name, container, formattedDate].filter(Boolean).join(', ');
   }
-}
-
-function findIndex(array, predicate) {
-  var index = -1;
-  array.some(function (item, i) {
-    if (predicate(item)) {
-      index = i;
-      return true;
-    }
-
-    return false;
-  });
-  return index;
 }

package/dist/cjs/ui/link-picker/link-search-error/index.js

@@ -0,0 +1,27 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _emptyState = _interopRequireDefault(require("@atlaskit/empty-state"));
+
+var _genericErrorSvg = _interopRequireDefault(require("../../../common/generic-error-svg"));
+
+var LinkSearchError = function LinkSearchError(props) {
+  return /*#__PURE__*/_react.default.createElement(_emptyState.default, (0, _extends2.default)({}, props, {
+    renderImage: function renderImage() {
+      return /*#__PURE__*/_react.default.createElement(_genericErrorSvg.default, null);
+    }
+  }));
+};
+
+var _default = LinkSearchError;
+exports.default = _default;

package/dist/cjs/ui/link-picker/messages.js

@@ -112,6 +112,16 @@ var messages = (0, _reactIntlNext.defineMessages)({
     id: 'fabric.linkPicker.button.save',
     defaultMessage: 'Save',
     description: 'Button to save edited link'
+  },
+  searchErrorHeader: {
+    id: 'fabric.linkPicker.search.error.heading',
+    defaultMessage: 'We’re having trouble loading data.',
+    description: 'Heading message shown when a search throws an error'
+  },
+  searchErrorDescription: {
+    id: 'fabric.linkPicker.search.error.description',
+    defaultMessage: 'Refresh the page, or contact <a>Atlassian Support</a> if this keeps happening.',
+    description: 'Describes possible actions when search throws an error'
   }
 });
 exports.messages = messages;

package/dist/cjs/ui/link-picker/url.js

@@ -75,11 +75,6 @@ var linkifyMatch = function linkifyMatch(text) {
 
 var isSafeUrl = function isSafeUrl(url) {
   var urlTrimmed = url.trim();
-
-  if (urlTrimmed.length === 0) {
-    return true;
-  }
-
   return whitelistedURLPatterns.some(function (p) {
     return p.test(urlTrimmed);
   });

package/dist/cjs/version.json

@@ -1,5 +1,5 @@
 {
 	"name": "@atlaskit/link-picker",
-	"version": "1.6.1",
+	"version": "1.7.0",
 	"sideEffects": false
 }

package/dist/es2019/services/use-plugins/index.js

@@ -1,6 +1,5 @@
-import { useEffect, useRef, useReducer, useMemo } from 'react';
+import { useEffect, useReducer, useMemo, useRef, useState, useCallback } from 'react';
 import { RECENT_SEARCH_LIST_SIZE } from '../../ui/link-picker';
-import { isSafeUrl } from '../../ui/link-picker/url';
 
 function reducer(state, payload) {
   return { ...state,
@@ -8,56 +7,40 @@ function reducer(state, payload) {
   };
 }
 
-export function usePlugins(state, plugins) {
+export function usePlugins(state, activeTab, plugins) {
+  const [retries, setRetries] = useState(0);
   const [pluginState, dispatch] = useReducer(reducer, {
-    items: [],
+    items: null,
+    error: null,
     isLoading: false
   });
-  const {
-    url,
-    selectedIndex
-  } = state;
   const {
     items,
-    isLoading
+    isLoading,
+    error
   } = pluginState;
-  const activePlugin = !plugins || plugins.length === 0 ? null : plugins[state.activeTab];
   const queryVersion = useRef(0);
-  const pluginRef = useRef(activePlugin);
-  const selectedItem = items[selectedIndex];
-  const isSelectedItem = (selectedItem === null || selectedItem === void 0 ? void 0 : selectedItem.url) === url;
+  const activePlugin = plugins === null || plugins === void 0 ? void 0 : plugins[activeTab];
   useEffect(() => {
     if (!activePlugin) {
       return;
     }
 
-    if (isSelectedItem) {
-      return;
-    }
-
-    if (isSafeUrl(url) && url.length) {
+    if (!state) {
       dispatch({
-        items: [],
-        isLoading: false
+        items: null,
+        isLoading: false,
+        error: null
       });
       return;
     }
 
-    const updates = activePlugin.resolve({
-      query: url
+    const updates = activePlugin.resolve(state);
+    dispatch({
+      items: null,
+      isLoading: true,
+      error: null
     });
-
-    if (pluginRef.current !== activePlugin) {
-      dispatch({
-        items: [],
-        isLoading: true
-      });
-    } else {
-      dispatch({
-        isLoading: true
-      });
-    }
-
     const newQuery = ++queryVersion.current;
 
     const updateResults = async () => {
@@ -90,15 +73,17 @@ export function usePlugins(state, plugins) {
             return;
           }
         }
-      } catch {
+      } catch (error) {
         dispatch({
+          error,
+          items: null,
           isLoading: false
         });
       }
     };
 
     updateResults();
-  }, [activePlugin, queryVersion, url, isSelectedItem]);
+  }, [activePlugin, queryVersion, state, retries]);
   const tabs = useMemo(() => {
     if (!plugins || plugins.length <= 1) {
       return [];
@@ -108,12 +93,17 @@ export function usePlugins(state, plugins) {
       tabTitle: plugin.tabTitle
     }));
   }, [plugins]);
+  const handleRetry = useCallback(() => {
+    setRetries(prev => ++prev);
+  }, []);
   return {
     tabs,
     items,
     isLoading,
-    isSelectedItem,
-    isActivePlugin: !!activePlugin
+    isActivePlugin: !!activePlugin,
+    error,
+    retry: handleRetry,
+    errorFallback: activePlugin === null || activePlugin === void 0 ? void 0 : activePlugin.errorFallback
   };
 }
 

package/dist/es2019/services/use-search-query/index.js

@@ -0,0 +1,32 @@
+import { useRef } from 'react';
+import { isSafeUrl } from '../../ui/link-picker/url';
+export function useSearchQuery(state) {
+  var _queryState$current;
+
+  const queryState = useRef(null);
+  /*
+   * When state contains a valid url AND is NOT selected from results
+   * queryState should be null to clear the items in plugin state
+   */
+
+  if (isSafeUrl(state.url) && state.selectedIndex === -1) {
+    queryState.current = null;
+  }
+  /*
+   * When state contains a search term e.g. Not a valid url return a query
+   */
+
+
+  if (((_queryState$current = queryState.current) === null || _queryState$current === void 0 ? void 0 : _queryState$current.query) !== state.url && !isSafeUrl(state.url)) {
+    queryState.current = {
+      query: state.url
+    };
+  }
+  /*
+   * When state contains a valid url and is selected from the list
+   * return current state to prevent triger a new plugin search
+   */
+
+
+  return queryState.current;
+}

package/dist/es2019/ui/error-boundary-fallback/index.js

@@ -2,7 +2,7 @@
 import { jsx } from '@emotion/react';
 import EmptyState from '@atlaskit/empty-state';
 import { defineMessages, useIntl } from 'react-intl-next';
-import GenericErrorSVG from './generic-error-svg';
+import GenericErrorSVG from '../../common/generic-error-svg';
 import { rootContainerStyles } from '../link-picker/styled';
 const messages = defineMessages({
   heading: {