@ndla/safelink 2.2.20 → 3.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/SafeLink.js +9 -7
- package/es/SafeLinkButton.js +7 -3
- package/lib/SafeLink.d.ts +1 -1
- package/lib/SafeLink.js +13 -11
- package/lib/SafeLinkButton.d.ts +1 -1
- package/lib/SafeLinkButton.js +7 -3
- package/package.json +6 -6
package/es/SafeLink.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import _styled from "@emotion/styled
|
|
1
|
+
import _styled from "@emotion/styled/base";
|
|
2
2
|
|
|
3
3
|
function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
|
|
4
4
|
|
|
@@ -20,7 +20,7 @@ import { Link } from 'react-router-dom';
|
|
|
20
20
|
import { Launch } from '@ndla/icons/common';
|
|
21
21
|
import { isString } from 'lodash';
|
|
22
22
|
import MissingRouterContext from './MissingRouterContext';
|
|
23
|
-
import { jsx as ___EmotionJSX } from "@emotion/
|
|
23
|
+
import { jsx as ___EmotionJSX } from "@emotion/react";
|
|
24
24
|
|
|
25
25
|
var isExternalLink = function isExternalLink(to) {
|
|
26
26
|
return to && isString(to) && (to.startsWith('https://') || to.startsWith('http://'));
|
|
@@ -30,15 +30,17 @@ export var isOldNdlaLink = function isOldNdlaLink(to) {
|
|
|
30
30
|
return to && isString(to) && to.match(/(.*)\/?node\/(\d+).*/) !== null;
|
|
31
31
|
};
|
|
32
32
|
|
|
33
|
-
var LaunchIcon = /*#__PURE__*/_styled(Launch, {
|
|
33
|
+
var LaunchIcon = /*#__PURE__*/_styled(Launch, process.env.NODE_ENV === "production" ? {
|
|
34
|
+
target: "e2rl38a0"
|
|
35
|
+
} : {
|
|
34
36
|
target: "e2rl38a0",
|
|
35
37
|
label: "LaunchIcon"
|
|
36
38
|
})(process.env.NODE_ENV === "production" ? {
|
|
37
|
-
name: "
|
|
38
|
-
styles: "margin-left:6px;height:auto;width:auto;margin-top:1px
|
|
39
|
+
name: "142nq9z",
|
|
40
|
+
styles: "margin-left:6px;height:auto;width:auto;margin-top:1px"
|
|
39
41
|
} : {
|
|
40
|
-
name: "
|
|
41
|
-
styles: "margin-left:6px;height:auto;width:auto;margin-top:1px
|
|
42
|
+
name: "142nq9z",
|
|
43
|
+
styles: "margin-left:6px;height:auto;width:auto;margin-top:1px",
|
|
42
44
|
map: "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIlNhZmVMaW5rLnRzeCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFvQmlDIiwiZmlsZSI6IlNhZmVMaW5rLnRzeCIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQ29weXJpZ2h0IChjKSAyMDE5LXByZXNlbnQsIE5ETEEuXG4gKlxuICogVGhpcyBzb3VyY2UgY29kZSBpcyBsaWNlbnNlZCB1bmRlciB0aGUgR1BMdjMgbGljZW5zZSBmb3VuZCBpbiB0aGVcbiAqIExJQ0VOU0UgZmlsZSBpbiB0aGUgcm9vdCBkaXJlY3Rvcnkgb2YgdGhpcyBzb3VyY2UgdHJlZS5cbiAqXG4gKi9cblxuaW1wb3J0IFJlYWN0LCB7IGZvcndhcmRSZWYsIEhUTUxBdHRyaWJ1dGVzLCBNdXRhYmxlUmVmT2JqZWN0LCBSZWFjdE5vZGUsIHVzZUNvbnRleHQgfSBmcm9tICdyZWFjdCc7XG5pbXBvcnQgeyBMaW5rLCBMaW5rUHJvcHMgfSBmcm9tICdyZWFjdC1yb3V0ZXItZG9tJztcbmltcG9ydCBzdHlsZWQgZnJvbSAnQGVtb3Rpb24vc3R5bGVkJztcbmltcG9ydCB7IExhdW5jaCB9IGZyb20gJ0BuZGxhL2ljb25zL2NvbW1vbic7XG5pbXBvcnQgeyBpc1N0cmluZyB9IGZyb20gJ2xvZGFzaCc7XG5pbXBvcnQgTWlzc2luZ1JvdXRlckNvbnRleHQgZnJvbSAnLi9NaXNzaW5nUm91dGVyQ29udGV4dCc7XG5cbmNvbnN0IGlzRXh0ZXJuYWxMaW5rID0gKHRvPzogTGlua1Byb3BzWyd0byddKSA9PlxuICB0byAmJiBpc1N0cmluZyh0bykgJiYgKHRvLnN0YXJ0c1dpdGgoJ2h0dHBzOi8vJykgfHwgdG8uc3RhcnRzV2l0aCgnaHR0cDovLycpKTtcblxuZXhwb3J0IGNvbnN0IGlzT2xkTmRsYUxpbmsgPSAodG8/OiBMaW5rUHJvcHNbJ3RvJ10pID0+IHRvICYmIGlzU3RyaW5nKHRvKSAmJiB0by5tYXRjaCgvKC4qKVxcLz9ub2RlXFwvKFxcZCspLiovKSAhPT0gbnVsbDtcblxuY29uc3QgTGF1bmNoSWNvbiA9IHN0eWxlZChMYXVuY2gpYFxuICBtYXJnaW4tbGVmdDogNnB4O1xuICBoZWlnaHQ6IGF1dG87XG4gIHdpZHRoOiBhdXRvO1xuICBtYXJnaW4tdG9wOiAxcHg7XG5gO1xuXG50eXBlIFByb3BzID0ge1xuICBzaG93TmV3V2luZG93SWNvbj86IGJvb2xlYW47XG4gIHJlZj86IE11dGFibGVSZWZPYmplY3Q8SFRNTEFuY2hvckVsZW1lbnQgfCBudWxsPjtcbiAgYXNBbmNob3I/OiBib29sZWFuO1xuICBjaGlsZHJlbj86IFJlYWN0Tm9kZTtcbn07XG5cbmV4cG9ydCB0eXBlIFNhZmVMaW5rUHJvcHMgPSBQcm9wcyAmIExpbmtQcm9wcyAmIEhUTUxBdHRyaWJ1dGVzPEhUTUxFbGVtZW50PjtcblxuLy8gRmFsbGJhY2sgdG8gbm9ybWFsIGxpbmsgaWYgYXBwIGlzIG1pc3NpbmcgUm91dGVyQ29udGV4dCwgbGluayBpcyBleHRlcm5hbCBvciBpcyBvbGQgbmRsYSBsaW5rXG5cbmNvbnN0IFNhZmVMaW5rID0gZm9yd2FyZFJlZjxIVE1MQW5jaG9yRWxlbWVudCwgU2FmZUxpbmtQcm9wcz4oXG4gICh7IHRvLCByZXBsYWNlLCBjaGlsZHJlbiwgc2hvd05ld1dpbmRvd0ljb24sIHRhYkluZGV4LCBhc0FuY2hvciwgLi4ucmVzdCB9LCByZWYpID0+IHtcbiAgICBjb25zdCBpc01pc3NpbmdSb3V0ZXJDb250ZXh0ID0gdXNlQ29udGV4dChNaXNzaW5nUm91dGVyQ29udGV4dCk7XG5cbiAgICBpZiAoaXNNaXNzaW5nUm91dGVyQ29udGV4dCB8fCBpc0V4dGVybmFsTGluayh0bykgfHwgaXNPbGROZGxhTGluayh0bykgfHwgYXNBbmNob3IpIHtcbiAgICAgIGNvbnN0IGhyZWYgPSB0eXBlb2YgdG8gPT09ICdzdHJpbmcnID8gdG8gOiAnIyc7XG4gICAgICByZXR1cm4gKFxuICAgICAgICA8YSBocmVmPXtocmVmfSByZWY9e3JlZn0gey4uLnJlc3R9PlxuICAgICAgICAgIHtjaGlsZHJlbn1cbiAgICAgICAgICB7c2hvd05ld1dpbmRvd0ljb24gJiYgPExhdW5jaEljb24gc3R5bGU9e3sgdmVydGljYWxBbGlnbjogJ3RleHQtdG9wJyB9fSAvPn1cbiAgICAgICAgPC9hPlxuICAgICAgKTtcbiAgICB9XG5cbiAgICByZXR1cm4gKFxuICAgICAgLy8gUlI2IGxpbmsgaW1tZWRpYXRlbHkgZmFpbHMgaWYgdG8gaXMgc29tZWhvdyB1bmRlZmluZWQsIHNvIHdlIHByb3ZpZGUgYW4gZW1wdHkgZmFsbGJhY2sgdG8gcmVjb3Zlci5cbiAgICAgIDxMaW5rIHJlZj17cmVmfSB0YWJJbmRleD17dGFiSW5kZXggPz8gMH0gdG89e3RvID8/ICcnfSByZXBsYWNlPXtyZXBsYWNlfSB7Li4ucmVzdH0+XG4gICAgICAgIHtjaGlsZHJlbn1cbiAgICAgICAge3Nob3dOZXdXaW5kb3dJY29uICYmIDxMYXVuY2hJY29uIHN0eWxlPXt7IHZlcnRpY2FsQWxpZ246ICd0ZXh0LXRvcCcgfX0gLz59XG4gICAgICA8L0xpbms+XG4gICAgKTtcbiAgfSxcbik7XG5cbmV4cG9ydCBkZWZhdWx0IFNhZmVMaW5rO1xuIl19 */",
|
|
43
45
|
toString: _EMOTION_STRINGIFIED_CSS_ERROR__
|
|
44
46
|
});
|
package/es/SafeLinkButton.js
CHANGED
|
@@ -12,10 +12,10 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
|
|
|
12
12
|
*
|
|
13
13
|
*/
|
|
14
14
|
import React from 'react';
|
|
15
|
-
import { css } from '@emotion/
|
|
15
|
+
import { css } from '@emotion/react';
|
|
16
16
|
import { appearances, ButtonStyles } from '@ndla/button';
|
|
17
17
|
import SafeLink from './SafeLink';
|
|
18
|
-
import { jsx as ___EmotionJSX } from "@emotion/
|
|
18
|
+
import { jsx as ___EmotionJSX } from "@emotion/react";
|
|
19
19
|
|
|
20
20
|
var getStyles = function getStyles(modifiers) {
|
|
21
21
|
return Object.keys(modifiers).map(function (key) {
|
|
@@ -65,7 +65,11 @@ var SafeLinkButton = function SafeLinkButton(_ref) {
|
|
|
65
65
|
var styles = ButtonStyles(buttonStyleProps);
|
|
66
66
|
return ___EmotionJSX(SafeLink, _extends({
|
|
67
67
|
to: to,
|
|
68
|
-
css:
|
|
68
|
+
css:
|
|
69
|
+
/*#__PURE__*/
|
|
70
|
+
|
|
71
|
+
/*#__PURE__*/
|
|
72
|
+
css(modifierStyles, " ", styles, ";" + (process.env.NODE_ENV === "production" ? "" : ";label:SafeLinkButton;"), process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIlNhZmVMaW5rQnV0dG9uLnRzeCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFtRmMiLCJmaWxlIjoiU2FmZUxpbmtCdXR0b24udHN4Iiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBDb3B5cmlnaHQgKGMpIDIwMTktcHJlc2VudCwgTkRMQS5cbiAqXG4gKiBUaGlzIHNvdXJjZSBjb2RlIGlzIGxpY2Vuc2VkIHVuZGVyIHRoZSBHUEx2MyBsaWNlbnNlIGZvdW5kIGluIHRoZVxuICogTElDRU5TRSBmaWxlIGluIHRoZSByb290IGRpcmVjdG9yeSBvZiB0aGlzIHNvdXJjZSB0cmVlLlxuICpcbiAqL1xuXG5pbXBvcnQgUmVhY3QsIHsgUmVhY3ROb2RlIH0gZnJvbSAncmVhY3QnO1xuaW1wb3J0IHsgY3NzIH0gZnJvbSAnQGVtb3Rpb24vcmVhY3QnO1xuaW1wb3J0IHsgYXBwZWFyYW5jZXMsIEJ1dHRvblN0eWxlcywgQnV0dG9uQXBwZWFyYW5jZSB9IGZyb20gJ0BuZGxhL2J1dHRvbic7XG5pbXBvcnQgU2FmZUxpbmsgZnJvbSAnLi9TYWZlTGluayc7XG5pbXBvcnQgeyBTYWZlTGlua1Byb3BzIH0gZnJvbSAnLic7XG5cbnR5cGUgU3R5bGVzUHJvcHMgPSBSZWNvcmQ8QnV0dG9uQXBwZWFyYW5jZSwgYm9vbGVhbiB8IHVuZGVmaW5lZD47XG5cbmNvbnN0IGdldFN0eWxlcyA9IChtb2RpZmllcnM6IFBhcnRpYWw8U3R5bGVzUHJvcHM+KSA9PlxuICAoT2JqZWN0LmtleXMobW9kaWZpZXJzKSBhcyBCdXR0b25BcHBlYXJhbmNlW10pXG4gICAgLm1hcCgoa2V5KSA9PiAobW9kaWZpZXJzW2tleV0gPyBhcHBlYXJhbmNlc1trZXldIDogdW5kZWZpbmVkKSlcbiAgICAuZmlsdGVyKChhcHBlYXJhbmNlKSA9PiAhIWFwcGVhcmFuY2UpO1xuXG5pbnRlcmZhY2UgUHJvcHMgZXh0ZW5kcyBTYWZlTGlua1Byb3BzIHtcbiAgb3V0bGluZT86IGJvb2xlYW47XG4gIHN0cmlwcGVkPzogYm9vbGVhbjtcbiAgbGluaz86IGJvb2xlYW47XG4gIGxpZ2h0ZXI/OiBib29sZWFuO1xuICBpbnZlcnRlZD86IGJvb2xlYW47XG4gIGludmVydGVkT3V0bGluZT86IGJvb2xlYW47XG4gIGNoaWxkcmVuOiBSZWFjdE5vZGU7XG4gIHRvOiBzdHJpbmc7XG4gIGNsYXNzTmFtZT86IHN0cmluZztcbiAgYnV0dG9uU2l6ZT86ICdub3JtYWwnIHwgJ21lZGl1bScgfCAnbGFyZ2UnO1xuICBib3JkZXJTaGFwZT86ICdub3JtYWwnIHwgJ3JvdW5kZWQnIHwgJ3NoYXJwZW5lZCc7XG4gIHdpZHRoPzogJ2F1dG8nIHwgJ2Z1bGwnO1xuICB0ZXh0QWxpZ24/OiAnY2VudGVyJyB8ICdsZWZ0JyB8ICdyaWdodCc7XG4gIGRhcmtlcj86IGJvb2xlYW47XG4gIGdyZXlMaWdodGVyPzogYm9vbGVhbjtcbiAgZ3JleUxpZ2h0ZXN0PzogYm9vbGVhbjtcbn1cblxuY29uc3QgU2FmZUxpbmtCdXR0b24gPSAoe1xuICBvdXRsaW5lLFxuICBzdHJpcHBlZCxcbiAgbGluayxcbiAgbGlnaHRlcixcbiAgY2hpbGRyZW4sXG4gIGludmVydGVkLFxuICBpbnZlcnRlZE91dGxpbmUsXG4gIHRvLFxuICBidXR0b25TaXplLFxuICBib3JkZXJTaGFwZSxcbiAgd2lkdGgsXG4gIHRleHRBbGlnbixcbiAgZGFya2VyLFxuICBncmV5TGlnaHRlcixcbiAgZ3JleUxpZ2h0ZXN0LFxuICAuLi5yZXN0XG59OiBQcm9wcykgPT4ge1xuICBjb25zdCBtb2RpZmllclN0eWxlcyA9IGdldFN0eWxlcyh7XG4gICAgbGluayxcbiAgICBvdXRsaW5lLFxuICAgIGxpZ2h0ZXIsXG4gICAgc3RyaXBwZWQsXG4gICAgaW52ZXJ0ZWQsXG4gICAgaW52ZXJ0ZWRPdXRsaW5lLFxuICB9KTtcblxuICBjb25zdCBidXR0b25TdHlsZVByb3BzID0ge1xuICAgIG91dGxpbmUsXG4gICAgbGlnaHRlcixcbiAgICBzaXplOiBidXR0b25TaXplLFxuICAgIGJvcmRlclNoYXBlLFxuICAgIHdpZHRoLFxuICAgIHRleHRBbGlnbixcbiAgICBkYXJrZXIsXG4gICAgZ3JleUxpZ2h0ZXIsXG4gICAgZ3JleUxpZ2h0ZXN0LFxuICB9O1xuICBjb25zdCBzdHlsZXMgPSBCdXR0b25TdHlsZXMoYnV0dG9uU3R5bGVQcm9wcyk7XG5cbiAgcmV0dXJuIChcbiAgICA8U2FmZUxpbmtcbiAgICAgIHRvPXt0b31cbiAgICAgIGNzcz17Y3NzYFxuICAgICAgICAke21vZGlmaWVyU3R5bGVzfVxuICAgICAgICAke3N0eWxlc31cbiAgICAgIGB9XG4gICAgICB7Li4ucmVzdH0+XG4gICAgICB7Y2hpbGRyZW59XG4gICAgPC9TYWZlTGluaz5cbiAgKTtcbn07XG5cbmV4cG9ydCBkZWZhdWx0IFNhZmVMaW5rQnV0dG9uO1xuIl19 */", process.env.NODE_ENV === "production" ? "" : ";label:SafeLinkButton;")
|
|
69
73
|
}, rest), children);
|
|
70
74
|
};
|
|
71
75
|
|
package/lib/SafeLink.d.ts
CHANGED
|
@@ -15,5 +15,5 @@ declare type Props = {
|
|
|
15
15
|
children?: ReactNode;
|
|
16
16
|
};
|
|
17
17
|
export declare type SafeLinkProps = Props & LinkProps & HTMLAttributes<HTMLElement>;
|
|
18
|
-
declare const SafeLink: React.ForwardRefExoticComponent<Pick<SafeLinkProps, "replace" | "media" | "hidden" | "dir" | "slot" | "style" | "title" | "color" | "translate" | "prefix" | "children" | "to" | "state" | "download" | "hrefLang" | "ping" | "rel" | "target" | "type" | "referrerPolicy" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "
|
|
18
|
+
declare const SafeLink: React.ForwardRefExoticComponent<Pick<SafeLinkProps, "replace" | "media" | "hidden" | "dir" | "slot" | "style" | "title" | "color" | "translate" | "prefix" | "children" | "className" | "to" | "state" | "download" | "hrefLang" | "ping" | "rel" | "target" | "type" | "referrerPolicy" | "defaultChecked" | "defaultValue" | "suppressContentEditableWarning" | "suppressHydrationWarning" | "accessKey" | "contentEditable" | "contextMenu" | "draggable" | "id" | "lang" | "placeholder" | "spellCheck" | "tabIndex" | "radioGroup" | "role" | "about" | "datatype" | "inlist" | "property" | "resource" | "typeof" | "vocab" | "autoCapitalize" | "autoCorrect" | "autoSave" | "itemProp" | "itemScope" | "itemType" | "itemID" | "itemRef" | "results" | "security" | "unselectable" | "inputMode" | "is" | "aria-activedescendant" | "aria-atomic" | "aria-autocomplete" | "aria-busy" | "aria-checked" | "aria-colcount" | "aria-colindex" | "aria-colspan" | "aria-controls" | "aria-current" | "aria-describedby" | "aria-details" | "aria-disabled" | "aria-dropeffect" | "aria-errormessage" | "aria-expanded" | "aria-flowto" | "aria-grabbed" | "aria-haspopup" | "aria-hidden" | "aria-invalid" | "aria-keyshortcuts" | "aria-label" | "aria-labelledby" | "aria-level" | "aria-live" | "aria-modal" | "aria-multiline" | "aria-multiselectable" | "aria-orientation" | "aria-owns" | "aria-placeholder" | "aria-posinset" | "aria-pressed" | "aria-readonly" | "aria-relevant" | "aria-required" | "aria-roledescription" | "aria-rowcount" | "aria-rowindex" | "aria-rowspan" | "aria-selected" | "aria-setsize" | "aria-sort" | "aria-valuemax" | "aria-valuemin" | "aria-valuenow" | "aria-valuetext" | "dangerouslySetInnerHTML" | "onCopy" | "onCopyCapture" | "onCut" | "onCutCapture" | "onPaste" | "onPasteCapture" | "onCompositionEnd" | "onCompositionEndCapture" | "onCompositionStart" | "onCompositionStartCapture" | "onCompositionUpdate" | "onCompositionUpdateCapture" | "onFocus" | "onFocusCapture" | "onBlur" | "onBlurCapture" | "onChange" | "onChangeCapture" | "onBeforeInput" | "onBeforeInputCapture" | "onInput" | "onInputCapture" | "onReset" | "onResetCapture" | "onSubmit" | "onSubmitCapture" | "onInvalid" | "onInvalidCapture" | "onLoad" | "onLoadCapture" | "onError" | "onErrorCapture" | "onKeyDown" | "onKeyDownCapture" | "onKeyPress" | "onKeyPressCapture" | "onKeyUp" | "onKeyUpCapture" | "onAbort" | "onAbortCapture" | "onCanPlay" | "onCanPlayCapture" | "onCanPlayThrough" | "onCanPlayThroughCapture" | "onDurationChange" | "onDurationChangeCapture" | "onEmptied" | "onEmptiedCapture" | "onEncrypted" | "onEncryptedCapture" | "onEnded" | "onEndedCapture" | "onLoadedData" | "onLoadedDataCapture" | "onLoadedMetadata" | "onLoadedMetadataCapture" | "onLoadStart" | "onLoadStartCapture" | "onPause" | "onPauseCapture" | "onPlay" | "onPlayCapture" | "onPlaying" | "onPlayingCapture" | "onProgress" | "onProgressCapture" | "onRateChange" | "onRateChangeCapture" | "onSeeked" | "onSeekedCapture" | "onSeeking" | "onSeekingCapture" | "onStalled" | "onStalledCapture" | "onSuspend" | "onSuspendCapture" | "onTimeUpdate" | "onTimeUpdateCapture" | "onVolumeChange" | "onVolumeChangeCapture" | "onWaiting" | "onWaitingCapture" | "onAuxClick" | "onAuxClickCapture" | "onClick" | "onClickCapture" | "onContextMenu" | "onContextMenuCapture" | "onDoubleClick" | "onDoubleClickCapture" | "onDrag" | "onDragCapture" | "onDragEnd" | "onDragEndCapture" | "onDragEnter" | "onDragEnterCapture" | "onDragExit" | "onDragExitCapture" | "onDragLeave" | "onDragLeaveCapture" | "onDragOver" | "onDragOverCapture" | "onDragStart" | "onDragStartCapture" | "onDrop" | "onDropCapture" | "onMouseDown" | "onMouseDownCapture" | "onMouseEnter" | "onMouseLeave" | "onMouseMove" | "onMouseMoveCapture" | "onMouseOut" | "onMouseOutCapture" | "onMouseOver" | "onMouseOverCapture" | "onMouseUp" | "onMouseUpCapture" | "onSelect" | "onSelectCapture" | "onTouchCancel" | "onTouchCancelCapture" | "onTouchEnd" | "onTouchEndCapture" | "onTouchMove" | "onTouchMoveCapture" | "onTouchStart" | "onTouchStartCapture" | "onPointerDown" | "onPointerDownCapture" | "onPointerMove" | "onPointerMoveCapture" | "onPointerUp" | "onPointerUpCapture" | "onPointerCancel" | "onPointerCancelCapture" | "onPointerEnter" | "onPointerEnterCapture" | "onPointerLeave" | "onPointerLeaveCapture" | "onPointerOver" | "onPointerOverCapture" | "onPointerOut" | "onPointerOutCapture" | "onGotPointerCapture" | "onGotPointerCaptureCapture" | "onLostPointerCapture" | "onLostPointerCaptureCapture" | "onScroll" | "onScrollCapture" | "onWheel" | "onWheelCapture" | "onAnimationStart" | "onAnimationStartCapture" | "onAnimationEnd" | "onAnimationEndCapture" | "onAnimationIteration" | "onAnimationIterationCapture" | "onTransitionEnd" | "onTransitionEndCapture" | "reloadDocument" | "showNewWindowIcon" | "asAnchor"> & React.RefAttributes<HTMLAnchorElement>>;
|
|
19
19
|
export default SafeLink;
|
package/lib/SafeLink.js
CHANGED
|
@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
});
|
|
8
8
|
exports["default"] = exports.isOldNdlaLink = void 0;
|
|
9
9
|
|
|
10
|
-
var
|
|
10
|
+
var _base = _interopRequireDefault(require("@emotion/styled/base"));
|
|
11
11
|
|
|
12
12
|
var _react = _interopRequireWildcard(require("react"));
|
|
13
13
|
|
|
@@ -19,7 +19,7 @@ var _lodash = require("lodash");
|
|
|
19
19
|
|
|
20
20
|
var _MissingRouterContext = _interopRequireDefault(require("./MissingRouterContext"));
|
|
21
21
|
|
|
22
|
-
var
|
|
22
|
+
var _react2 = require("@emotion/react");
|
|
23
23
|
|
|
24
24
|
function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
|
|
25
25
|
|
|
@@ -44,15 +44,17 @@ var isOldNdlaLink = function isOldNdlaLink(to) {
|
|
|
44
44
|
};
|
|
45
45
|
|
|
46
46
|
exports.isOldNdlaLink = isOldNdlaLink;
|
|
47
|
-
var LaunchIcon =
|
|
47
|
+
var LaunchIcon = /*#__PURE__*/(0, _base["default"])(_common.Launch, process.env.NODE_ENV === "production" ? {
|
|
48
|
+
target: "e2rl38a0"
|
|
49
|
+
} : {
|
|
48
50
|
target: "e2rl38a0",
|
|
49
51
|
label: "LaunchIcon"
|
|
50
52
|
})(process.env.NODE_ENV === "production" ? {
|
|
51
|
-
name: "
|
|
52
|
-
styles: "margin-left:6px;height:auto;width:auto;margin-top:1px
|
|
53
|
+
name: "142nq9z",
|
|
54
|
+
styles: "margin-left:6px;height:auto;width:auto;margin-top:1px"
|
|
53
55
|
} : {
|
|
54
|
-
name: "
|
|
55
|
-
styles: "margin-left:6px;height:auto;width:auto;margin-top:1px
|
|
56
|
+
name: "142nq9z",
|
|
57
|
+
styles: "margin-left:6px;height:auto;width:auto;margin-top:1px",
|
|
56
58
|
map: "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIlNhZmVMaW5rLnRzeCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFvQmlDIiwiZmlsZSI6IlNhZmVMaW5rLnRzeCIsInNvdXJjZXNDb250ZW50IjpbIi8qKlxuICogQ29weXJpZ2h0IChjKSAyMDE5LXByZXNlbnQsIE5ETEEuXG4gKlxuICogVGhpcyBzb3VyY2UgY29kZSBpcyBsaWNlbnNlZCB1bmRlciB0aGUgR1BMdjMgbGljZW5zZSBmb3VuZCBpbiB0aGVcbiAqIExJQ0VOU0UgZmlsZSBpbiB0aGUgcm9vdCBkaXJlY3Rvcnkgb2YgdGhpcyBzb3VyY2UgdHJlZS5cbiAqXG4gKi9cblxuaW1wb3J0IFJlYWN0LCB7IGZvcndhcmRSZWYsIEhUTUxBdHRyaWJ1dGVzLCBNdXRhYmxlUmVmT2JqZWN0LCBSZWFjdE5vZGUsIHVzZUNvbnRleHQgfSBmcm9tICdyZWFjdCc7XG5pbXBvcnQgeyBMaW5rLCBMaW5rUHJvcHMgfSBmcm9tICdyZWFjdC1yb3V0ZXItZG9tJztcbmltcG9ydCBzdHlsZWQgZnJvbSAnQGVtb3Rpb24vc3R5bGVkJztcbmltcG9ydCB7IExhdW5jaCB9IGZyb20gJ0BuZGxhL2ljb25zL2NvbW1vbic7XG5pbXBvcnQgeyBpc1N0cmluZyB9IGZyb20gJ2xvZGFzaCc7XG5pbXBvcnQgTWlzc2luZ1JvdXRlckNvbnRleHQgZnJvbSAnLi9NaXNzaW5nUm91dGVyQ29udGV4dCc7XG5cbmNvbnN0IGlzRXh0ZXJuYWxMaW5rID0gKHRvPzogTGlua1Byb3BzWyd0byddKSA9PlxuICB0byAmJiBpc1N0cmluZyh0bykgJiYgKHRvLnN0YXJ0c1dpdGgoJ2h0dHBzOi8vJykgfHwgdG8uc3RhcnRzV2l0aCgnaHR0cDovLycpKTtcblxuZXhwb3J0IGNvbnN0IGlzT2xkTmRsYUxpbmsgPSAodG8/OiBMaW5rUHJvcHNbJ3RvJ10pID0+IHRvICYmIGlzU3RyaW5nKHRvKSAmJiB0by5tYXRjaCgvKC4qKVxcLz9ub2RlXFwvKFxcZCspLiovKSAhPT0gbnVsbDtcblxuY29uc3QgTGF1bmNoSWNvbiA9IHN0eWxlZChMYXVuY2gpYFxuICBtYXJnaW4tbGVmdDogNnB4O1xuICBoZWlnaHQ6IGF1dG87XG4gIHdpZHRoOiBhdXRvO1xuICBtYXJnaW4tdG9wOiAxcHg7XG5gO1xuXG50eXBlIFByb3BzID0ge1xuICBzaG93TmV3V2luZG93SWNvbj86IGJvb2xlYW47XG4gIHJlZj86IE11dGFibGVSZWZPYmplY3Q8SFRNTEFuY2hvckVsZW1lbnQgfCBudWxsPjtcbiAgYXNBbmNob3I/OiBib29sZWFuO1xuICBjaGlsZHJlbj86IFJlYWN0Tm9kZTtcbn07XG5cbmV4cG9ydCB0eXBlIFNhZmVMaW5rUHJvcHMgPSBQcm9wcyAmIExpbmtQcm9wcyAmIEhUTUxBdHRyaWJ1dGVzPEhUTUxFbGVtZW50PjtcblxuLy8gRmFsbGJhY2sgdG8gbm9ybWFsIGxpbmsgaWYgYXBwIGlzIG1pc3NpbmcgUm91dGVyQ29udGV4dCwgbGluayBpcyBleHRlcm5hbCBvciBpcyBvbGQgbmRsYSBsaW5rXG5cbmNvbnN0IFNhZmVMaW5rID0gZm9yd2FyZFJlZjxIVE1MQW5jaG9yRWxlbWVudCwgU2FmZUxpbmtQcm9wcz4oXG4gICh7IHRvLCByZXBsYWNlLCBjaGlsZHJlbiwgc2hvd05ld1dpbmRvd0ljb24sIHRhYkluZGV4LCBhc0FuY2hvciwgLi4ucmVzdCB9LCByZWYpID0+IHtcbiAgICBjb25zdCBpc01pc3NpbmdSb3V0ZXJDb250ZXh0ID0gdXNlQ29udGV4dChNaXNzaW5nUm91dGVyQ29udGV4dCk7XG5cbiAgICBpZiAoaXNNaXNzaW5nUm91dGVyQ29udGV4dCB8fCBpc0V4dGVybmFsTGluayh0bykgfHwgaXNPbGROZGxhTGluayh0bykgfHwgYXNBbmNob3IpIHtcbiAgICAgIGNvbnN0IGhyZWYgPSB0eXBlb2YgdG8gPT09ICdzdHJpbmcnID8gdG8gOiAnIyc7XG4gICAgICByZXR1cm4gKFxuICAgICAgICA8YSBocmVmPXtocmVmfSByZWY9e3JlZn0gey4uLnJlc3R9PlxuICAgICAgICAgIHtjaGlsZHJlbn1cbiAgICAgICAgICB7c2hvd05ld1dpbmRvd0ljb24gJiYgPExhdW5jaEljb24gc3R5bGU9e3sgdmVydGljYWxBbGlnbjogJ3RleHQtdG9wJyB9fSAvPn1cbiAgICAgICAgPC9hPlxuICAgICAgKTtcbiAgICB9XG5cbiAgICByZXR1cm4gKFxuICAgICAgLy8gUlI2IGxpbmsgaW1tZWRpYXRlbHkgZmFpbHMgaWYgdG8gaXMgc29tZWhvdyB1bmRlZmluZWQsIHNvIHdlIHByb3ZpZGUgYW4gZW1wdHkgZmFsbGJhY2sgdG8gcmVjb3Zlci5cbiAgICAgIDxMaW5rIHJlZj17cmVmfSB0YWJJbmRleD17dGFiSW5kZXggPz8gMH0gdG89e3RvID8/ICcnfSByZXBsYWNlPXtyZXBsYWNlfSB7Li4ucmVzdH0+XG4gICAgICAgIHtjaGlsZHJlbn1cbiAgICAgICAge3Nob3dOZXdXaW5kb3dJY29uICYmIDxMYXVuY2hJY29uIHN0eWxlPXt7IHZlcnRpY2FsQWxpZ246ICd0ZXh0LXRvcCcgfX0gLz59XG4gICAgICA8L0xpbms+XG4gICAgKTtcbiAgfSxcbik7XG5cbmV4cG9ydCBkZWZhdWx0IFNhZmVMaW5rO1xuIl19 */",
|
|
57
59
|
toString: _EMOTION_STRINGIFIED_CSS_ERROR__
|
|
58
60
|
});
|
|
@@ -70,10 +72,10 @@ var SafeLink = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
|
|
|
70
72
|
|
|
71
73
|
if (isMissingRouterContext || isExternalLink(to) || isOldNdlaLink(to) || asAnchor) {
|
|
72
74
|
var href = typeof to === 'string' ? to : '#';
|
|
73
|
-
return (0,
|
|
75
|
+
return (0, _react2.jsx)("a", _extends({
|
|
74
76
|
href: href,
|
|
75
77
|
ref: ref
|
|
76
|
-
}, rest), children, showNewWindowIcon && (0,
|
|
78
|
+
}, rest), children, showNewWindowIcon && (0, _react2.jsx)(LaunchIcon, {
|
|
77
79
|
style: {
|
|
78
80
|
verticalAlign: 'text-top'
|
|
79
81
|
}
|
|
@@ -81,12 +83,12 @@ var SafeLink = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
|
|
|
81
83
|
}
|
|
82
84
|
|
|
83
85
|
return (// RR6 link immediately fails if to is somehow undefined, so we provide an empty fallback to recover.
|
|
84
|
-
(0,
|
|
86
|
+
(0, _react2.jsx)(_reactRouterDom.Link, _extends({
|
|
85
87
|
ref: ref,
|
|
86
88
|
tabIndex: tabIndex !== null && tabIndex !== void 0 ? tabIndex : 0,
|
|
87
89
|
to: to !== null && to !== void 0 ? to : '',
|
|
88
90
|
replace: replace
|
|
89
|
-
}, rest), children, showNewWindowIcon && (0,
|
|
91
|
+
}, rest), children, showNewWindowIcon && (0, _react2.jsx)(LaunchIcon, {
|
|
90
92
|
style: {
|
|
91
93
|
verticalAlign: 'text-top'
|
|
92
94
|
}
|
package/lib/SafeLinkButton.d.ts
CHANGED
|
@@ -25,5 +25,5 @@ interface Props extends SafeLinkProps {
|
|
|
25
25
|
greyLighter?: boolean;
|
|
26
26
|
greyLightest?: boolean;
|
|
27
27
|
}
|
|
28
|
-
declare const SafeLinkButton: ({ outline, stripped, link, lighter, children, inverted, invertedOutline, to, buttonSize, borderShape, width, textAlign, darker, greyLighter, greyLightest, ...rest }: Props) =>
|
|
28
|
+
declare const SafeLinkButton: ({ outline, stripped, link, lighter, children, inverted, invertedOutline, to, buttonSize, borderShape, width, textAlign, darker, greyLighter, greyLightest, ...rest }: Props) => import("@emotion/react/types/jsx-namespace").EmotionJSX.Element;
|
|
29
29
|
export default SafeLinkButton;
|
package/lib/SafeLinkButton.js
CHANGED
|
@@ -7,7 +7,7 @@ exports["default"] = void 0;
|
|
|
7
7
|
|
|
8
8
|
var _react = _interopRequireDefault(require("react"));
|
|
9
9
|
|
|
10
|
-
var
|
|
10
|
+
var _react2 = require("@emotion/react");
|
|
11
11
|
|
|
12
12
|
var _button = require("@ndla/button");
|
|
13
13
|
|
|
@@ -67,9 +67,13 @@ var SafeLinkButton = function SafeLinkButton(_ref) {
|
|
|
67
67
|
greyLightest: greyLightest
|
|
68
68
|
};
|
|
69
69
|
var styles = (0, _button.ButtonStyles)(buttonStyleProps);
|
|
70
|
-
return (0,
|
|
70
|
+
return (0, _react2.jsx)(_SafeLink["default"], _extends({
|
|
71
71
|
to: to,
|
|
72
|
-
css:
|
|
72
|
+
css:
|
|
73
|
+
/*#__PURE__*/
|
|
74
|
+
|
|
75
|
+
/*#__PURE__*/
|
|
76
|
+
(0, _react2.css)(modifierStyles, " ", styles, ";" + (process.env.NODE_ENV === "production" ? "" : ";label:SafeLinkButton;"), process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIlNhZmVMaW5rQnV0dG9uLnRzeCJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFtRmMiLCJmaWxlIjoiU2FmZUxpbmtCdXR0b24udHN4Iiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBDb3B5cmlnaHQgKGMpIDIwMTktcHJlc2VudCwgTkRMQS5cbiAqXG4gKiBUaGlzIHNvdXJjZSBjb2RlIGlzIGxpY2Vuc2VkIHVuZGVyIHRoZSBHUEx2MyBsaWNlbnNlIGZvdW5kIGluIHRoZVxuICogTElDRU5TRSBmaWxlIGluIHRoZSByb290IGRpcmVjdG9yeSBvZiB0aGlzIHNvdXJjZSB0cmVlLlxuICpcbiAqL1xuXG5pbXBvcnQgUmVhY3QsIHsgUmVhY3ROb2RlIH0gZnJvbSAncmVhY3QnO1xuaW1wb3J0IHsgY3NzIH0gZnJvbSAnQGVtb3Rpb24vcmVhY3QnO1xuaW1wb3J0IHsgYXBwZWFyYW5jZXMsIEJ1dHRvblN0eWxlcywgQnV0dG9uQXBwZWFyYW5jZSB9IGZyb20gJ0BuZGxhL2J1dHRvbic7XG5pbXBvcnQgU2FmZUxpbmsgZnJvbSAnLi9TYWZlTGluayc7XG5pbXBvcnQgeyBTYWZlTGlua1Byb3BzIH0gZnJvbSAnLic7XG5cbnR5cGUgU3R5bGVzUHJvcHMgPSBSZWNvcmQ8QnV0dG9uQXBwZWFyYW5jZSwgYm9vbGVhbiB8IHVuZGVmaW5lZD47XG5cbmNvbnN0IGdldFN0eWxlcyA9IChtb2RpZmllcnM6IFBhcnRpYWw8U3R5bGVzUHJvcHM+KSA9PlxuICAoT2JqZWN0LmtleXMobW9kaWZpZXJzKSBhcyBCdXR0b25BcHBlYXJhbmNlW10pXG4gICAgLm1hcCgoa2V5KSA9PiAobW9kaWZpZXJzW2tleV0gPyBhcHBlYXJhbmNlc1trZXldIDogdW5kZWZpbmVkKSlcbiAgICAuZmlsdGVyKChhcHBlYXJhbmNlKSA9PiAhIWFwcGVhcmFuY2UpO1xuXG5pbnRlcmZhY2UgUHJvcHMgZXh0ZW5kcyBTYWZlTGlua1Byb3BzIHtcbiAgb3V0bGluZT86IGJvb2xlYW47XG4gIHN0cmlwcGVkPzogYm9vbGVhbjtcbiAgbGluaz86IGJvb2xlYW47XG4gIGxpZ2h0ZXI/OiBib29sZWFuO1xuICBpbnZlcnRlZD86IGJvb2xlYW47XG4gIGludmVydGVkT3V0bGluZT86IGJvb2xlYW47XG4gIGNoaWxkcmVuOiBSZWFjdE5vZGU7XG4gIHRvOiBzdHJpbmc7XG4gIGNsYXNzTmFtZT86IHN0cmluZztcbiAgYnV0dG9uU2l6ZT86ICdub3JtYWwnIHwgJ21lZGl1bScgfCAnbGFyZ2UnO1xuICBib3JkZXJTaGFwZT86ICdub3JtYWwnIHwgJ3JvdW5kZWQnIHwgJ3NoYXJwZW5lZCc7XG4gIHdpZHRoPzogJ2F1dG8nIHwgJ2Z1bGwnO1xuICB0ZXh0QWxpZ24/OiAnY2VudGVyJyB8ICdsZWZ0JyB8ICdyaWdodCc7XG4gIGRhcmtlcj86IGJvb2xlYW47XG4gIGdyZXlMaWdodGVyPzogYm9vbGVhbjtcbiAgZ3JleUxpZ2h0ZXN0PzogYm9vbGVhbjtcbn1cblxuY29uc3QgU2FmZUxpbmtCdXR0b24gPSAoe1xuICBvdXRsaW5lLFxuICBzdHJpcHBlZCxcbiAgbGluayxcbiAgbGlnaHRlcixcbiAgY2hpbGRyZW4sXG4gIGludmVydGVkLFxuICBpbnZlcnRlZE91dGxpbmUsXG4gIHRvLFxuICBidXR0b25TaXplLFxuICBib3JkZXJTaGFwZSxcbiAgd2lkdGgsXG4gIHRleHRBbGlnbixcbiAgZGFya2VyLFxuICBncmV5TGlnaHRlcixcbiAgZ3JleUxpZ2h0ZXN0LFxuICAuLi5yZXN0XG59OiBQcm9wcykgPT4ge1xuICBjb25zdCBtb2RpZmllclN0eWxlcyA9IGdldFN0eWxlcyh7XG4gICAgbGluayxcbiAgICBvdXRsaW5lLFxuICAgIGxpZ2h0ZXIsXG4gICAgc3RyaXBwZWQsXG4gICAgaW52ZXJ0ZWQsXG4gICAgaW52ZXJ0ZWRPdXRsaW5lLFxuICB9KTtcblxuICBjb25zdCBidXR0b25TdHlsZVByb3BzID0ge1xuICAgIG91dGxpbmUsXG4gICAgbGlnaHRlcixcbiAgICBzaXplOiBidXR0b25TaXplLFxuICAgIGJvcmRlclNoYXBlLFxuICAgIHdpZHRoLFxuICAgIHRleHRBbGlnbixcbiAgICBkYXJrZXIsXG4gICAgZ3JleUxpZ2h0ZXIsXG4gICAgZ3JleUxpZ2h0ZXN0LFxuICB9O1xuICBjb25zdCBzdHlsZXMgPSBCdXR0b25TdHlsZXMoYnV0dG9uU3R5bGVQcm9wcyk7XG5cbiAgcmV0dXJuIChcbiAgICA8U2FmZUxpbmtcbiAgICAgIHRvPXt0b31cbiAgICAgIGNzcz17Y3NzYFxuICAgICAgICAke21vZGlmaWVyU3R5bGVzfVxuICAgICAgICAke3N0eWxlc31cbiAgICAgIGB9XG4gICAgICB7Li4ucmVzdH0+XG4gICAgICB7Y2hpbGRyZW59XG4gICAgPC9TYWZlTGluaz5cbiAgKTtcbn07XG5cbmV4cG9ydCBkZWZhdWx0IFNhZmVMaW5rQnV0dG9uO1xuIl19 */", process.env.NODE_ENV === "production" ? "" : ";label:SafeLinkButton;")
|
|
73
77
|
}, rest), children);
|
|
74
78
|
};
|
|
75
79
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ndla/safelink",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "3.0.0",
|
|
4
4
|
"description": "SafeLink component for NDLA",
|
|
5
5
|
"license": "GPL-3.0",
|
|
6
6
|
"main": "lib/index.js",
|
|
@@ -26,18 +26,18 @@
|
|
|
26
26
|
"es"
|
|
27
27
|
],
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@ndla/button": "^
|
|
30
|
-
"@ndla/icons": "^
|
|
29
|
+
"@ndla/button": "^4.0.0",
|
|
30
|
+
"@ndla/icons": "^2.0.0",
|
|
31
31
|
"lodash": "^4.17.20"
|
|
32
32
|
},
|
|
33
33
|
"peerDependencies": {
|
|
34
|
-
"@emotion/
|
|
35
|
-
"@emotion/styled": "^10.
|
|
34
|
+
"@emotion/react": "^11.10.4",
|
|
35
|
+
"@emotion/styled": "^11.10.4",
|
|
36
36
|
"react": "16.13.1 || ^17.0.0",
|
|
37
37
|
"react-router-dom": "^6.3.0"
|
|
38
38
|
},
|
|
39
39
|
"publishConfig": {
|
|
40
40
|
"access": "public"
|
|
41
41
|
},
|
|
42
|
-
"gitHead": "
|
|
42
|
+
"gitHead": "7f4578ae15653f2f6a1efde17d24991e77f026bc"
|
|
43
43
|
}
|