@khanacademy/wonder-blocks-clickable 4.2.4 → 4.2.5
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/CHANGELOG.md +9 -0
- package/dist/es/index.js +2 -28
- package/dist/index.js +29 -51
- package/package.json +4 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,14 @@
|
|
|
1
1
|
# @khanacademy/wonder-blocks-clickable
|
|
2
2
|
|
|
3
|
+
## 4.2.5
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 559e82d5: Update to build tooling, generating smaller output
|
|
8
|
+
- Updated dependencies [559e82d5]
|
|
9
|
+
- @khanacademy/wonder-blocks-core@6.4.3
|
|
10
|
+
- @khanacademy/wonder-blocks-tokens@1.3.1
|
|
11
|
+
|
|
3
12
|
## 4.2.4
|
|
4
13
|
|
|
5
14
|
### Patch Changes
|
package/dist/es/index.js
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import _objectWithoutPropertiesLoose from '@babel/runtime/helpers/objectWithoutPropertiesLoose';
|
|
2
|
+
import _extends from '@babel/runtime/helpers/extends';
|
|
1
3
|
import * as React from 'react';
|
|
2
4
|
import { StyleSheet } from 'aphrodite';
|
|
3
5
|
import { withRouter, Link } from 'react-router-dom';
|
|
@@ -5,34 +7,6 @@ import { __RouterContext } from 'react-router';
|
|
|
5
7
|
import { addStyle } from '@khanacademy/wonder-blocks-core';
|
|
6
8
|
import { color } from '@khanacademy/wonder-blocks-tokens';
|
|
7
9
|
|
|
8
|
-
function _objectWithoutPropertiesLoose(source, excluded) {
|
|
9
|
-
if (source == null) return {};
|
|
10
|
-
var target = {};
|
|
11
|
-
var sourceKeys = Object.keys(source);
|
|
12
|
-
var key, i;
|
|
13
|
-
for (i = 0; i < sourceKeys.length; i++) {
|
|
14
|
-
key = sourceKeys[i];
|
|
15
|
-
if (excluded.indexOf(key) >= 0) continue;
|
|
16
|
-
target[key] = source[key];
|
|
17
|
-
}
|
|
18
|
-
return target;
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
function _extends() {
|
|
22
|
-
_extends = Object.assign ? Object.assign.bind() : function (target) {
|
|
23
|
-
for (var i = 1; i < arguments.length; i++) {
|
|
24
|
-
var source = arguments[i];
|
|
25
|
-
for (var key in source) {
|
|
26
|
-
if (Object.prototype.hasOwnProperty.call(source, key)) {
|
|
27
|
-
target[key] = source[key];
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
|
-
}
|
|
31
|
-
return target;
|
|
32
|
-
};
|
|
33
|
-
return _extends.apply(this, arguments);
|
|
34
|
-
}
|
|
35
|
-
|
|
36
10
|
const getAppropriateTriggersForRole = role => {
|
|
37
11
|
switch (role) {
|
|
38
12
|
case "link":
|
package/dist/index.js
CHANGED
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
+
var _objectWithoutPropertiesLoose = require('@babel/runtime/helpers/objectWithoutPropertiesLoose');
|
|
6
|
+
var _extends = require('@babel/runtime/helpers/extends');
|
|
5
7
|
var React = require('react');
|
|
6
8
|
var aphrodite = require('aphrodite');
|
|
7
9
|
var reactRouterDom = require('react-router-dom');
|
|
@@ -9,54 +11,30 @@ var reactRouter = require('react-router');
|
|
|
9
11
|
var wonderBlocksCore = require('@khanacademy/wonder-blocks-core');
|
|
10
12
|
var wonderBlocksTokens = require('@khanacademy/wonder-blocks-tokens');
|
|
11
13
|
|
|
14
|
+
function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
|
|
15
|
+
|
|
12
16
|
function _interopNamespace(e) {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
17
|
+
if (e && e.__esModule) return e;
|
|
18
|
+
var n = Object.create(null);
|
|
19
|
+
if (e) {
|
|
20
|
+
Object.keys(e).forEach(function (k) {
|
|
21
|
+
if (k !== 'default') {
|
|
22
|
+
var d = Object.getOwnPropertyDescriptor(e, k);
|
|
23
|
+
Object.defineProperty(n, k, d.get ? d : {
|
|
24
|
+
enumerable: true,
|
|
25
|
+
get: function () { return e[k]; }
|
|
26
|
+
});
|
|
27
|
+
}
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
n["default"] = e;
|
|
31
|
+
return Object.freeze(n);
|
|
28
32
|
}
|
|
29
33
|
|
|
34
|
+
var _objectWithoutPropertiesLoose__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutPropertiesLoose);
|
|
35
|
+
var _extends__default = /*#__PURE__*/_interopDefaultLegacy(_extends);
|
|
30
36
|
var React__namespace = /*#__PURE__*/_interopNamespace(React);
|
|
31
37
|
|
|
32
|
-
function _objectWithoutPropertiesLoose(source, excluded) {
|
|
33
|
-
if (source == null) return {};
|
|
34
|
-
var target = {};
|
|
35
|
-
var sourceKeys = Object.keys(source);
|
|
36
|
-
var key, i;
|
|
37
|
-
for (i = 0; i < sourceKeys.length; i++) {
|
|
38
|
-
key = sourceKeys[i];
|
|
39
|
-
if (excluded.indexOf(key) >= 0) continue;
|
|
40
|
-
target[key] = source[key];
|
|
41
|
-
}
|
|
42
|
-
return target;
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
function _extends() {
|
|
46
|
-
_extends = Object.assign ? Object.assign.bind() : function (target) {
|
|
47
|
-
for (var i = 1; i < arguments.length; i++) {
|
|
48
|
-
var source = arguments[i];
|
|
49
|
-
for (var key in source) {
|
|
50
|
-
if (Object.prototype.hasOwnProperty.call(source, key)) {
|
|
51
|
-
target[key] = source[key];
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
return target;
|
|
56
|
-
};
|
|
57
|
-
return _extends.apply(this, arguments);
|
|
58
|
-
}
|
|
59
|
-
|
|
60
38
|
const getAppropriateTriggersForRole = role => {
|
|
61
39
|
switch (role) {
|
|
62
40
|
case "link":
|
|
@@ -107,7 +85,7 @@ const startState = {
|
|
|
107
85
|
class ClickableBehavior extends React__namespace.Component {
|
|
108
86
|
static getDerivedStateFromProps(props, state) {
|
|
109
87
|
if (props.disabled) {
|
|
110
|
-
return
|
|
88
|
+
return _extends__default["default"]({}, startState, {
|
|
111
89
|
focused: state.focused
|
|
112
90
|
});
|
|
113
91
|
} else {
|
|
@@ -356,7 +334,7 @@ class ClickableBehavior extends React__namespace.Component {
|
|
|
356
334
|
}
|
|
357
335
|
render() {
|
|
358
336
|
const rel = this.props.rel || (this.props.target === "_blank" ? "noopener noreferrer" : undefined);
|
|
359
|
-
const childrenProps = this.props.disabled ?
|
|
337
|
+
const childrenProps = this.props.disabled ? _extends__default["default"]({}, disabledHandlers, {
|
|
360
338
|
onFocus: this.handleFocus,
|
|
361
339
|
onBlur: this.handleBlur,
|
|
362
340
|
tabIndex: this.props.tabIndex,
|
|
@@ -411,7 +389,7 @@ const Clickable = React__namespace.forwardRef(function Clickable(props, ref) {
|
|
|
411
389
|
const activeHref = props.href && !props.disabled;
|
|
412
390
|
const useClient = router && !props.skipClientNav && isClientSideUrl(props.href || "");
|
|
413
391
|
if (activeHref && useClient && props.href) {
|
|
414
|
-
return React__namespace.createElement(StyledLink,
|
|
392
|
+
return React__namespace.createElement(StyledLink, _extends__default["default"]({}, commonProps, {
|
|
415
393
|
to: props.href,
|
|
416
394
|
role: props.role,
|
|
417
395
|
target: props.target || undefined,
|
|
@@ -419,7 +397,7 @@ const Clickable = React__namespace.forwardRef(function Clickable(props, ref) {
|
|
|
419
397
|
ref: ref
|
|
420
398
|
}), props.children(clickableState));
|
|
421
399
|
} else if (activeHref && !useClient) {
|
|
422
|
-
return React__namespace.createElement(StyledAnchor,
|
|
400
|
+
return React__namespace.createElement(StyledAnchor, _extends__default["default"]({}, commonProps, {
|
|
423
401
|
href: props.href,
|
|
424
402
|
role: props.role,
|
|
425
403
|
target: props.target || undefined,
|
|
@@ -427,7 +405,7 @@ const Clickable = React__namespace.forwardRef(function Clickable(props, ref) {
|
|
|
427
405
|
ref: ref
|
|
428
406
|
}), props.children(clickableState));
|
|
429
407
|
} else {
|
|
430
|
-
return React__namespace.createElement(StyledButton,
|
|
408
|
+
return React__namespace.createElement(StyledButton, _extends__default["default"]({}, commonProps, {
|
|
431
409
|
type: "button",
|
|
432
410
|
"aria-disabled": props.disabled,
|
|
433
411
|
ref: ref
|
|
@@ -454,7 +432,7 @@ const Clickable = React__namespace.forwardRef(function Clickable(props, ref) {
|
|
|
454
432
|
disabled,
|
|
455
433
|
tabIndex
|
|
456
434
|
} = props,
|
|
457
|
-
restProps =
|
|
435
|
+
restProps = _objectWithoutPropertiesLoose__default["default"](props, _excluded);
|
|
458
436
|
const ClickableBehavior = getClickableBehavior(href, skipClientNav, router);
|
|
459
437
|
const getStyle = state => [styles.reset, styles.link, !hideDefaultFocusRing && state.focused && (light ? styles.focusedLight : styles.focused), disabled && styles.disabled, style];
|
|
460
438
|
if (beforeNav) {
|
|
@@ -470,7 +448,7 @@ const Clickable = React__namespace.forwardRef(function Clickable(props, ref) {
|
|
|
470
448
|
onMouseUp: onMouseUp,
|
|
471
449
|
disabled: disabled,
|
|
472
450
|
tabIndex: tabIndex
|
|
473
|
-
}, (state, childrenProps) => getCorrectTag(state, router,
|
|
451
|
+
}, (state, childrenProps) => getCorrectTag(state, router, _extends__default["default"]({}, restProps, {
|
|
474
452
|
"data-testid": testId,
|
|
475
453
|
style: getStyle(state)
|
|
476
454
|
}, childrenProps)));
|
|
@@ -487,7 +465,7 @@ const Clickable = React__namespace.forwardRef(function Clickable(props, ref) {
|
|
|
487
465
|
target: target,
|
|
488
466
|
disabled: disabled,
|
|
489
467
|
tabIndex: tabIndex
|
|
490
|
-
}, (state, childrenProps) => getCorrectTag(state, router,
|
|
468
|
+
}, (state, childrenProps) => getCorrectTag(state, router, _extends__default["default"]({}, restProps, {
|
|
491
469
|
"data-testid": testId,
|
|
492
470
|
style: getStyle(state)
|
|
493
471
|
}, childrenProps)));
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@khanacademy/wonder-blocks-clickable",
|
|
3
|
-
"version": "4.2.
|
|
3
|
+
"version": "4.2.5",
|
|
4
4
|
"design": "v1",
|
|
5
5
|
"description": "Clickable component for Wonder-Blocks.",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
18
|
"@babel/runtime": "^7.18.6",
|
|
19
|
-
"@khanacademy/wonder-blocks-core": "^6.4.
|
|
20
|
-
"@khanacademy/wonder-blocks-tokens": "^1.3.
|
|
19
|
+
"@khanacademy/wonder-blocks-core": "^6.4.3",
|
|
20
|
+
"@khanacademy/wonder-blocks-tokens": "^1.3.1"
|
|
21
21
|
},
|
|
22
22
|
"peerDependencies": {
|
|
23
23
|
"aphrodite": "^1.2.5",
|
|
@@ -27,6 +27,6 @@
|
|
|
27
27
|
"react-router-dom": "5.3.0"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
|
-
"@khanacademy/wb-dev-build-settings": "^1.0.
|
|
30
|
+
"@khanacademy/wb-dev-build-settings": "^1.0.1"
|
|
31
31
|
}
|
|
32
32
|
}
|