@react-aria/utils 3.20.0 → 3.21.1
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/dist/import.mjs +185 -62
- package/dist/main.js +187 -59
- package/dist/main.js.map +1 -1
- package/dist/module.js +185 -62
- package/dist/module.js.map +1 -1
- package/dist/types.d.ts +43 -11
- package/dist/types.d.ts.map +1 -1
- package/package.json +4 -4
- package/src/filterDOMProps.ts +16 -3
- package/src/index.ts +1 -0
- package/src/openLink.tsx +154 -0
- package/src/platform.ts +4 -0
- package/src/useSyncRef.ts +1 -1
- package/src/useViewportSize.ts +3 -1
package/src/filterDOMProps.ts
CHANGED
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
* governing permissions and limitations under the License.
|
|
11
11
|
*/
|
|
12
12
|
|
|
13
|
-
import {AriaLabelingProps, DOMProps} from '@react-types/shared';
|
|
13
|
+
import {AriaLabelingProps, DOMProps, LinkDOMProps} from '@react-types/shared';
|
|
14
14
|
|
|
15
15
|
const DOMPropNames = new Set([
|
|
16
16
|
'id'
|
|
@@ -23,11 +23,23 @@ const labelablePropNames = new Set([
|
|
|
23
23
|
'aria-details'
|
|
24
24
|
]);
|
|
25
25
|
|
|
26
|
+
// See LinkDOMProps in dom.d.ts.
|
|
27
|
+
const linkPropNames = new Set([
|
|
28
|
+
'href',
|
|
29
|
+
'target',
|
|
30
|
+
'rel',
|
|
31
|
+
'download',
|
|
32
|
+
'ping',
|
|
33
|
+
'referrerPolicy'
|
|
34
|
+
]);
|
|
35
|
+
|
|
26
36
|
interface Options {
|
|
27
37
|
/**
|
|
28
38
|
* If labelling associated aria properties should be included in the filter.
|
|
29
39
|
*/
|
|
30
40
|
labelable?: boolean,
|
|
41
|
+
/** Whether the element is a link and should include DOM props for <a> elements. */
|
|
42
|
+
isLink?: boolean,
|
|
31
43
|
/**
|
|
32
44
|
* A Set of other property names that should be included in the filter.
|
|
33
45
|
*/
|
|
@@ -41,8 +53,8 @@ const propRe = /^(data-.*)$/;
|
|
|
41
53
|
* @param props - The component props to be filtered.
|
|
42
54
|
* @param opts - Props to override.
|
|
43
55
|
*/
|
|
44
|
-
export function filterDOMProps(props: DOMProps & AriaLabelingProps, opts: Options = {}): DOMProps & AriaLabelingProps {
|
|
45
|
-
let {labelable, propNames} = opts;
|
|
56
|
+
export function filterDOMProps(props: DOMProps & AriaLabelingProps & LinkDOMProps, opts: Options = {}): DOMProps & AriaLabelingProps {
|
|
57
|
+
let {labelable, isLink, propNames} = opts;
|
|
46
58
|
let filteredProps = {};
|
|
47
59
|
|
|
48
60
|
for (const prop in props) {
|
|
@@ -50,6 +62,7 @@ export function filterDOMProps(props: DOMProps & AriaLabelingProps, opts: Option
|
|
|
50
62
|
Object.prototype.hasOwnProperty.call(props, prop) && (
|
|
51
63
|
DOMPropNames.has(prop) ||
|
|
52
64
|
(labelable && labelablePropNames.has(prop)) ||
|
|
65
|
+
(isLink && linkPropNames.has(prop)) ||
|
|
53
66
|
propNames?.has(prop) ||
|
|
54
67
|
propRe.test(prop)
|
|
55
68
|
)
|
package/src/index.ts
CHANGED
|
@@ -16,6 +16,7 @@ export {mergeRefs} from './mergeRefs';
|
|
|
16
16
|
export {filterDOMProps} from './filterDOMProps';
|
|
17
17
|
export {focusWithoutScrolling} from './focusWithoutScrolling';
|
|
18
18
|
export {getOffset} from './getOffset';
|
|
19
|
+
export {openLink, getSyntheticLinkProps, RouterProvider, shouldClientNavigate, useRouter} from './openLink';
|
|
19
20
|
export {runAfterTransition} from './runAfterTransition';
|
|
20
21
|
export {useDrag1D} from './useDrag1D';
|
|
21
22
|
export {useGlobalListeners} from './useGlobalListeners';
|
package/src/openLink.tsx
ADDED
|
@@ -0,0 +1,154 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright 2023 Adobe. All rights reserved.
|
|
3
|
+
* This file is licensed to you under the Apache License, Version 2.0 (the "License");
|
|
4
|
+
* you may not use this file except in compliance with the License. You may obtain a copy
|
|
5
|
+
* of the License at http://www.apache.org/licenses/LICENSE-2.0
|
|
6
|
+
*
|
|
7
|
+
* Unless required by applicable law or agreed to in writing, software distributed under
|
|
8
|
+
* the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
|
|
9
|
+
* OF ANY KIND, either express or implied. See the License for the specific language
|
|
10
|
+
* governing permissions and limitations under the License.
|
|
11
|
+
*/
|
|
12
|
+
|
|
13
|
+
import {focusWithoutScrolling, isMac, isWebKit} from './index';
|
|
14
|
+
import {isFirefox, isIPad} from './platform';
|
|
15
|
+
import {LinkDOMProps} from '@react-types/shared';
|
|
16
|
+
import React, {createContext, ReactNode, useContext, useMemo} from 'react';
|
|
17
|
+
|
|
18
|
+
interface Router {
|
|
19
|
+
isNative: boolean,
|
|
20
|
+
open: (target: Element, modifiers: Modifiers) => void
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
const RouterContext = createContext<Router>({
|
|
24
|
+
isNative: true,
|
|
25
|
+
open: openSyntheticLink
|
|
26
|
+
});
|
|
27
|
+
|
|
28
|
+
interface RouterProviderProps {
|
|
29
|
+
navigate: (path: string) => void,
|
|
30
|
+
children: ReactNode
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
/**
|
|
34
|
+
* A RouterProvider accepts a `navigate` function from a framework or client side router,
|
|
35
|
+
* and provides it to all nested React Aria links to enable client side navigation.
|
|
36
|
+
*/
|
|
37
|
+
export function RouterProvider(props: RouterProviderProps) {
|
|
38
|
+
let {children, navigate} = props;
|
|
39
|
+
|
|
40
|
+
let ctx = useMemo(() => ({
|
|
41
|
+
isNative: false,
|
|
42
|
+
open: (target: Element, modifiers: Modifiers) => {
|
|
43
|
+
getSyntheticLink(target, link => {
|
|
44
|
+
if (shouldClientNavigate(link, modifiers)) {
|
|
45
|
+
navigate(link.pathname + link.search + link.hash);
|
|
46
|
+
} else {
|
|
47
|
+
openLink(link, modifiers);
|
|
48
|
+
}
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
}), [navigate]);
|
|
52
|
+
|
|
53
|
+
return (
|
|
54
|
+
<RouterContext.Provider value={ctx}>
|
|
55
|
+
{children}
|
|
56
|
+
</RouterContext.Provider>
|
|
57
|
+
);
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
export function useRouter(): Router {
|
|
61
|
+
return useContext(RouterContext);
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
interface Modifiers {
|
|
65
|
+
metaKey?: boolean,
|
|
66
|
+
ctrlKey?: boolean,
|
|
67
|
+
altKey?: boolean,
|
|
68
|
+
shiftKey?: boolean
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
export function shouldClientNavigate(link: HTMLAnchorElement, modifiers: Modifiers) {
|
|
72
|
+
// Use getAttribute here instead of link.target. Firefox will default link.target to "_parent" when inside an iframe.
|
|
73
|
+
let target = link.getAttribute('target');
|
|
74
|
+
return (
|
|
75
|
+
(!target || target === '_self') &&
|
|
76
|
+
link.origin === location.origin &&
|
|
77
|
+
!link.hasAttribute('download') &&
|
|
78
|
+
!modifiers.metaKey && // open in new tab (mac)
|
|
79
|
+
!modifiers.ctrlKey && // open in new tab (windows)
|
|
80
|
+
!modifiers.altKey && // download
|
|
81
|
+
!modifiers.shiftKey
|
|
82
|
+
);
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
export function openLink(target: HTMLAnchorElement, modifiers: Modifiers, setOpening = true) {
|
|
86
|
+
let {metaKey, ctrlKey, altKey, shiftKey} = modifiers;
|
|
87
|
+
|
|
88
|
+
// Firefox does not recognize keyboard events as a user action by default, and the popup blocker
|
|
89
|
+
// will prevent links with target="_blank" from opening. However, it does allow the event if the
|
|
90
|
+
// Command/Control key is held, which opens the link in a background tab. This seems like the best we can do.
|
|
91
|
+
// See https://bugzilla.mozilla.org/show_bug.cgi?id=257870 and https://bugzilla.mozilla.org/show_bug.cgi?id=746640.
|
|
92
|
+
if (isFirefox() && window.event?.type?.startsWith('key') && target.target === '_blank') {
|
|
93
|
+
if (isMac()) {
|
|
94
|
+
metaKey = true;
|
|
95
|
+
} else {
|
|
96
|
+
ctrlKey = true;
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
// WebKit does not support firing click events with modifier keys, but does support keyboard events.
|
|
101
|
+
// https://github.com/WebKit/WebKit/blob/c03d0ac6e6db178f90923a0a63080b5ca210d25f/Source/WebCore/html/HTMLAnchorElement.cpp#L184
|
|
102
|
+
let event = isWebKit() && isMac() && !isIPad() && process.env.NODE_ENV !== 'test'
|
|
103
|
+
// @ts-ignore - keyIdentifier is a non-standard property, but it's what webkit expects
|
|
104
|
+
? new KeyboardEvent('keydown', {keyIdentifier: 'Enter', metaKey, ctrlKey, altKey, shiftKey})
|
|
105
|
+
: new MouseEvent('click', {metaKey, ctrlKey, altKey, shiftKey, bubbles: true, cancelable: true});
|
|
106
|
+
(openLink as any).isOpening = setOpening;
|
|
107
|
+
focusWithoutScrolling(target);
|
|
108
|
+
target.dispatchEvent(event);
|
|
109
|
+
(openLink as any).isOpening = false;
|
|
110
|
+
}
|
|
111
|
+
// https://github.com/parcel-bundler/parcel/issues/8724
|
|
112
|
+
(openLink as any).isOpening = false;
|
|
113
|
+
|
|
114
|
+
function getSyntheticLink(target: Element, open: (link: HTMLAnchorElement) => void) {
|
|
115
|
+
if (target instanceof HTMLAnchorElement) {
|
|
116
|
+
open(target);
|
|
117
|
+
} else if (target.hasAttribute('data-href')) {
|
|
118
|
+
let link = document.createElement('a');
|
|
119
|
+
link.href = target.getAttribute('data-href');
|
|
120
|
+
if (target.hasAttribute('data-target')) {
|
|
121
|
+
link.target = target.getAttribute('data-target');
|
|
122
|
+
}
|
|
123
|
+
if (target.hasAttribute('data-rel')) {
|
|
124
|
+
link.rel = target.getAttribute('data-rel');
|
|
125
|
+
}
|
|
126
|
+
if (target.hasAttribute('data-download')) {
|
|
127
|
+
link.download = target.getAttribute('data-download');
|
|
128
|
+
}
|
|
129
|
+
if (target.hasAttribute('data-ping')) {
|
|
130
|
+
link.ping = target.getAttribute('data-ping');
|
|
131
|
+
}
|
|
132
|
+
if (target.hasAttribute('data-referrer-policy')) {
|
|
133
|
+
link.referrerPolicy = target.getAttribute('data-referrer-policy');
|
|
134
|
+
}
|
|
135
|
+
target.appendChild(link);
|
|
136
|
+
open(link);
|
|
137
|
+
target.removeChild(link);
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
function openSyntheticLink(target: Element, modifiers: Modifiers) {
|
|
142
|
+
getSyntheticLink(target, link => openLink(link, modifiers));
|
|
143
|
+
}
|
|
144
|
+
|
|
145
|
+
export function getSyntheticLinkProps(props: LinkDOMProps) {
|
|
146
|
+
return {
|
|
147
|
+
'data-href': props.href,
|
|
148
|
+
'data-target': props.target,
|
|
149
|
+
'data-rel': props.rel,
|
|
150
|
+
'data-download': props.download,
|
|
151
|
+
'data-ping': props.ping,
|
|
152
|
+
'data-referrer-policy': props.referrerPolicy
|
|
153
|
+
};
|
|
154
|
+
}
|
package/src/platform.ts
CHANGED
package/src/useSyncRef.ts
CHANGED
package/src/useViewportSize.ts
CHANGED
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
*/
|
|
12
12
|
|
|
13
13
|
import {useEffect, useState} from 'react';
|
|
14
|
+
import {useIsSSR} from '@react-aria/ssr';
|
|
14
15
|
|
|
15
16
|
interface ViewportSize {
|
|
16
17
|
width: number,
|
|
@@ -21,7 +22,8 @@ interface ViewportSize {
|
|
|
21
22
|
let visualViewport = typeof document !== 'undefined' && window.visualViewport;
|
|
22
23
|
|
|
23
24
|
export function useViewportSize(): ViewportSize {
|
|
24
|
-
let
|
|
25
|
+
let isSSR = useIsSSR();
|
|
26
|
+
let [size, setSize] = useState(() => isSSR ? {width: 0, height: 0} : getViewportSize());
|
|
25
27
|
|
|
26
28
|
useEffect(() => {
|
|
27
29
|
// Use visualViewport api to track available height even on iOS virtual keyboard opening
|