@atlaskit/top-layer 0.9.0 → 0.11.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/CHANGELOG.md +33 -0
- package/README.md +5 -1
- package/dialog/create-close-event/package.json +17 -0
- package/dist/cjs/animations/presets.js +10 -5
- package/dist/cjs/arrow/index.js +131 -0
- package/dist/cjs/arrow/types.js +5 -0
- package/dist/cjs/dialog/dialog-content.js +11 -6
- package/dist/cjs/entry-points/dialog/create-close-event.js +12 -0
- package/dist/cjs/entry-points/placement-map.js +6 -5
- package/dist/cjs/entry-points/popover/create-close-event.js +12 -0
- package/dist/cjs/focus/focus.js +71 -19
- package/dist/cjs/index.js +3 -4
- package/dist/cjs/internal/resolve-css-length-to-pixels.js +61 -10
- package/dist/cjs/internal/role-types.js +40 -9
- package/dist/cjs/internal/set-style.js +23 -25
- package/dist/cjs/internal/use-anchor-position.js +107 -68
- package/dist/cjs/internal/use-focus-wrap.js +13 -2
- package/dist/cjs/internal/use-initial-focus.js +31 -10
- package/dist/cjs/placement-map/index.js +9 -111
- package/dist/cjs/placement-map/legacy-placements.js +113 -0
- package/dist/cjs/popover/popover.js +14 -12
- package/dist/cjs/popup/popup-content.js +19 -13
- package/dist/cjs/popup/popup-surface.js +6 -0
- package/dist/cjs/popup/popup-trigger-function.js +1 -1
- package/dist/cjs/popup/popup-trigger.js +17 -37
- package/dist/cjs/popup/popup.js +21 -10
- package/dist/cjs/use-arrow-navigation/use-arrow-navigation.js +26 -10
- package/dist/es2019/animations/presets.js +20 -5
- package/dist/es2019/arrow/index.js +269 -0
- package/dist/es2019/arrow/types.js +1 -0
- package/dist/es2019/dialog/dialog-content.js +11 -6
- package/dist/es2019/entry-points/create-close-event.js +7 -0
- package/dist/es2019/entry-points/dialog/create-close-event.js +1 -0
- package/dist/es2019/entry-points/placement-map.js +2 -1
- package/dist/es2019/entry-points/popover/create-close-event.js +1 -0
- package/dist/es2019/focus/focus.js +56 -7
- package/dist/es2019/index.js +3 -4
- package/dist/es2019/internal/resolve-css-length-to-pixels.js +60 -7
- package/dist/es2019/internal/role-types.js +40 -9
- package/dist/es2019/internal/set-style.js +19 -22
- package/dist/es2019/internal/use-anchor-position.js +95 -54
- package/dist/es2019/internal/use-focus-wrap.js +14 -3
- package/dist/es2019/internal/use-initial-focus.js +32 -11
- package/dist/es2019/placement-map/index.js +8 -109
- package/dist/es2019/placement-map/legacy-placements.js +107 -0
- package/dist/es2019/popover/popover.js +14 -11
- package/dist/es2019/popup/popup-content.js +20 -14
- package/dist/es2019/popup/popup-surface.js +6 -0
- package/dist/es2019/popup/popup-trigger-function.js +1 -1
- package/dist/es2019/popup/popup-trigger.js +17 -37
- package/dist/es2019/popup/popup.js +20 -9
- package/dist/es2019/use-arrow-navigation/use-arrow-navigation.js +26 -10
- package/dist/esm/animations/presets.js +9 -4
- package/dist/esm/arrow/index.js +124 -0
- package/dist/esm/arrow/types.js +1 -0
- package/dist/esm/dialog/dialog-content.js +11 -6
- package/dist/esm/entry-points/create-close-event.js +7 -0
- package/dist/esm/entry-points/dialog/create-close-event.js +1 -0
- package/dist/esm/entry-points/placement-map.js +2 -1
- package/dist/esm/entry-points/popover/create-close-event.js +1 -0
- package/dist/esm/focus/focus.js +70 -19
- package/dist/esm/index.js +3 -4
- package/dist/esm/internal/resolve-css-length-to-pixels.js +61 -10
- package/dist/esm/internal/role-types.js +39 -9
- package/dist/esm/internal/set-style.js +23 -25
- package/dist/esm/internal/use-anchor-position.js +108 -64
- package/dist/esm/internal/use-focus-wrap.js +14 -3
- package/dist/esm/internal/use-initial-focus.js +32 -11
- package/dist/esm/placement-map/index.js +8 -109
- package/dist/esm/placement-map/legacy-placements.js +107 -0
- package/dist/esm/popover/popover.js +14 -12
- package/dist/esm/popup/popup-content.js +20 -14
- package/dist/esm/popup/popup-surface.js +6 -0
- package/dist/esm/popup/popup-trigger-function.js +1 -1
- package/dist/esm/popup/popup-trigger.js +17 -37
- package/dist/esm/popup/popup.js +21 -10
- package/dist/esm/use-arrow-navigation/use-arrow-navigation.js +26 -10
- package/dist/types/arrow/index.d.ts +24 -0
- package/dist/types/arrow/types.d.ts +29 -0
- package/dist/types/dialog/dialog-content.d.ts +5 -1
- package/dist/types/dialog/types.d.ts +50 -24
- package/dist/types/entry-points/create-close-event.d.ts +7 -0
- package/dist/types/entry-points/dialog/create-close-event.d.ts +2 -0
- package/dist/types/entry-points/placement-map.d.ts +2 -1
- package/dist/types/entry-points/popover/create-close-event.d.ts +2 -0
- package/dist/types/focus/focus.d.ts +8 -0
- package/dist/types/internal/resolve-css-length-to-pixels.d.ts +4 -6
- package/dist/types/internal/role-types.d.ts +25 -4
- package/dist/types/internal/set-style.d.ts +2 -19
- package/dist/types/internal/use-anchor-position.d.ts +2 -3
- package/dist/types/internal/use-initial-focus.d.ts +5 -4
- package/dist/types/placement-map/index.d.ts +8 -21
- package/dist/types/placement-map/legacy-placements.d.ts +21 -0
- package/dist/types/popover/popover.d.ts +1 -1
- package/dist/types/popover/types.d.ts +17 -17
- package/dist/types/popup/popup-surface.d.ts +6 -0
- package/dist/types/popup/popup-trigger-function.d.ts +10 -6
- package/dist/types/popup/popup-trigger.d.ts +8 -17
- package/dist/types/popup/popup.d.ts +2 -2
- package/dist/types/popup/types.d.ts +68 -22
- package/dist/types/use-arrow-navigation/use-arrow-navigation.d.ts +19 -5
- package/dist/types-ts4.5/arrow/index.d.ts +24 -0
- package/dist/types-ts4.5/arrow/types.d.ts +29 -0
- package/dist/types-ts4.5/dialog/dialog-content.d.ts +5 -1
- package/dist/types-ts4.5/dialog/types.d.ts +50 -24
- package/dist/types-ts4.5/entry-points/create-close-event.d.ts +7 -0
- package/dist/types-ts4.5/entry-points/dialog/create-close-event.d.ts +2 -0
- package/dist/types-ts4.5/entry-points/placement-map.d.ts +2 -1
- package/dist/types-ts4.5/entry-points/popover/create-close-event.d.ts +2 -0
- package/dist/types-ts4.5/focus/focus.d.ts +8 -0
- package/dist/types-ts4.5/internal/resolve-css-length-to-pixels.d.ts +4 -6
- package/dist/types-ts4.5/internal/role-types.d.ts +25 -4
- package/dist/types-ts4.5/internal/set-style.d.ts +2 -19
- package/dist/types-ts4.5/internal/use-anchor-position.d.ts +2 -3
- package/dist/types-ts4.5/internal/use-initial-focus.d.ts +5 -4
- package/dist/types-ts4.5/placement-map/index.d.ts +8 -21
- package/dist/types-ts4.5/placement-map/legacy-placements.d.ts +39 -0
- package/dist/types-ts4.5/popover/popover.d.ts +1 -1
- package/dist/types-ts4.5/popover/types.d.ts +17 -17
- package/dist/types-ts4.5/popup/popup-surface.d.ts +6 -0
- package/dist/types-ts4.5/popup/popup-trigger-function.d.ts +10 -6
- package/dist/types-ts4.5/popup/popup-trigger.d.ts +8 -17
- package/dist/types-ts4.5/popup/popup.d.ts +2 -2
- package/dist/types-ts4.5/popup/types.d.ts +68 -22
- package/dist/types-ts4.5/use-arrow-navigation/use-arrow-navigation.d.ts +19 -5
- package/package.json +1 -1
- package/popover/create-close-event/package.json +17 -0
|
@@ -2,10 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
|
2
2
|
import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
|
|
3
3
|
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; }
|
|
4
4
|
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) { _defineProperty(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; }
|
|
5
|
-
|
|
6
|
-
* Legacy Popper.js placement values (used by `@atlaskit/popper`, `@atlaskit/popup`,
|
|
7
|
-
* `@atlaskit/tooltip`, etc.).
|
|
8
|
-
*/
|
|
5
|
+
import { placementMapping } from './legacy-placements';
|
|
9
6
|
|
|
10
7
|
/**
|
|
11
8
|
* Maps legacy Popper.js placement values to the new object-based
|
|
@@ -17,9 +14,11 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
17
14
|
* | ------------------- | --------------------------------------------------- |
|
|
18
15
|
* | `top` | `{ axis: 'block', edge: 'start', align: 'center' }` |
|
|
19
16
|
* | `top-start` | `{ axis: 'block', edge: 'start', align: 'start' }` |
|
|
17
|
+
* | `top-center` | `{ axis: 'block', edge: 'start', align: 'center' }` |
|
|
20
18
|
* | `top-end` | `{ axis: 'block', edge: 'start', align: 'end' }` |
|
|
21
19
|
* | `bottom` | `{ axis: 'block', edge: 'end', align: 'center' }` |
|
|
22
20
|
* | `bottom-start` | `{ axis: 'block', edge: 'end', align: 'start' }` |
|
|
21
|
+
* | `bottom-center` | `{ axis: 'block', edge: 'end', align: 'center' }` |
|
|
23
22
|
* | `bottom-end` | `{ axis: 'block', edge: 'end', align: 'end' }` |
|
|
24
23
|
* | `right` | `{ axis: 'inline', edge: 'end', align: 'center' }` |
|
|
25
24
|
* | `right-start` | `{ axis: 'inline', edge: 'end', align: 'start' }` |
|
|
@@ -31,7 +30,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
31
30
|
* | `auto-start` | `{ axis: 'block', edge: 'end', align: 'start' }` |
|
|
32
31
|
* | `auto-end` | `{ axis: 'block', edge: 'end', align: 'end' }` |
|
|
33
32
|
*
|
|
34
|
-
*
|
|
33
|
+
* `auto*` is mapped to `block-end` (a reduction in expressiveness vs Popper's
|
|
34
|
+
* runtime auto-flip). CSS `position-try-fallbacks` provides flipping at the
|
|
35
|
+
* edge - but the initial placement is fixed. If migrating away from Popper's
|
|
36
|
+
* dynamic auto, prefer an explicit placement.
|
|
35
37
|
*
|
|
36
38
|
* @example
|
|
37
39
|
* ```ts
|
|
@@ -43,103 +45,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
43
45
|
* // newPlacement === { axis: 'block', edge: 'end', align: 'start' }
|
|
44
46
|
* ```
|
|
45
47
|
*/
|
|
46
|
-
var placementMapping = {
|
|
47
|
-
top: {
|
|
48
|
-
axis: 'block',
|
|
49
|
-
edge: 'start',
|
|
50
|
-
align: 'center'
|
|
51
|
-
},
|
|
52
|
-
'top-start': {
|
|
53
|
-
axis: 'block',
|
|
54
|
-
edge: 'start',
|
|
55
|
-
align: 'start'
|
|
56
|
-
},
|
|
57
|
-
'top-center': {
|
|
58
|
-
axis: 'block',
|
|
59
|
-
edge: 'start',
|
|
60
|
-
align: 'center'
|
|
61
|
-
},
|
|
62
|
-
'top-end': {
|
|
63
|
-
axis: 'block',
|
|
64
|
-
edge: 'start',
|
|
65
|
-
align: 'end'
|
|
66
|
-
},
|
|
67
|
-
bottom: {
|
|
68
|
-
axis: 'block',
|
|
69
|
-
edge: 'end',
|
|
70
|
-
align: 'center'
|
|
71
|
-
},
|
|
72
|
-
'bottom-start': {
|
|
73
|
-
axis: 'block',
|
|
74
|
-
edge: 'end',
|
|
75
|
-
align: 'start'
|
|
76
|
-
},
|
|
77
|
-
'bottom-center': {
|
|
78
|
-
axis: 'block',
|
|
79
|
-
edge: 'end',
|
|
80
|
-
align: 'center'
|
|
81
|
-
},
|
|
82
|
-
'bottom-end': {
|
|
83
|
-
axis: 'block',
|
|
84
|
-
edge: 'end',
|
|
85
|
-
align: 'end'
|
|
86
|
-
},
|
|
87
|
-
right: {
|
|
88
|
-
axis: 'inline',
|
|
89
|
-
edge: 'end',
|
|
90
|
-
align: 'center'
|
|
91
|
-
},
|
|
92
|
-
'right-start': {
|
|
93
|
-
axis: 'inline',
|
|
94
|
-
edge: 'end',
|
|
95
|
-
align: 'start'
|
|
96
|
-
},
|
|
97
|
-
'right-end': {
|
|
98
|
-
axis: 'inline',
|
|
99
|
-
edge: 'end',
|
|
100
|
-
align: 'end'
|
|
101
|
-
},
|
|
102
|
-
left: {
|
|
103
|
-
axis: 'inline',
|
|
104
|
-
edge: 'start',
|
|
105
|
-
align: 'center'
|
|
106
|
-
},
|
|
107
|
-
'left-start': {
|
|
108
|
-
axis: 'inline',
|
|
109
|
-
edge: 'start',
|
|
110
|
-
align: 'start'
|
|
111
|
-
},
|
|
112
|
-
'left-end': {
|
|
113
|
-
axis: 'inline',
|
|
114
|
-
edge: 'start',
|
|
115
|
-
align: 'end'
|
|
116
|
-
},
|
|
117
|
-
auto: {
|
|
118
|
-
axis: 'block',
|
|
119
|
-
edge: 'end',
|
|
120
|
-
align: 'center'
|
|
121
|
-
},
|
|
122
|
-
'auto-start': {
|
|
123
|
-
axis: 'block',
|
|
124
|
-
edge: 'end',
|
|
125
|
-
align: 'start'
|
|
126
|
-
},
|
|
127
|
-
'auto-end': {
|
|
128
|
-
axis: 'block',
|
|
129
|
-
edge: 'end',
|
|
130
|
-
align: 'end'
|
|
131
|
-
}
|
|
132
|
-
};
|
|
133
|
-
|
|
134
|
-
/**
|
|
135
|
-
* Convert a legacy Popper.js placement to the new `position-area`-based Placement.
|
|
136
|
-
* Optional `offset` is the legacy Popper `[along, away]` tuple (also known as
|
|
137
|
-
* `[skidding, distance]`); negative `along` becomes `direction: 'backwards'`.
|
|
138
|
-
*
|
|
139
|
-
* The tuple keeps the historical popper names so call sites that already pass
|
|
140
|
-
* `[along, away]` migrate without thinking; the new internal field names
|
|
141
|
-
* (`gap` / `crossAxisShift`) are produced inside this adapter.
|
|
142
|
-
*/
|
|
143
48
|
export function fromLegacyPlacement(_ref) {
|
|
144
49
|
var legacy = _ref.legacy,
|
|
145
50
|
offset = _ref.offset;
|
|
@@ -160,10 +65,4 @@ export function fromLegacyPlacement(_ref) {
|
|
|
160
65
|
}
|
|
161
66
|
}
|
|
162
67
|
});
|
|
163
|
-
}
|
|
164
|
-
|
|
165
|
-
/**
|
|
166
|
-
* The full mapping record, exposed for consumers that need to iterate or introspect.
|
|
167
|
-
*/
|
|
168
|
-
// eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
|
|
169
|
-
export { placementMapping };
|
|
68
|
+
}
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Legacy Popper.js placement values (used by `@atlaskit/popper`,
|
|
3
|
+
* `@atlaskit/popup`, `@atlaskit/tooltip`, etc.). Re-exported from
|
|
4
|
+
* `@atlaskit/top-layer/placement-map` for migration consumers that need
|
|
5
|
+
* to enumerate every placement (e.g. for a settings dropdown). New code
|
|
6
|
+
* should use the object-based `TPlacementOptions` directly.
|
|
7
|
+
*/
|
|
8
|
+
// eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
|
|
9
|
+
export var LEGACY_PLACEMENTS = ['auto', 'auto-start', 'auto-end', 'top', 'top-start', 'top-center', 'top-end', 'bottom', 'bottom-start', 'bottom-center', 'bottom-end', 'right', 'right-start', 'right-end', 'left', 'left-start', 'left-end'];
|
|
10
|
+
/**
|
|
11
|
+
* The full mapping record. Internal - use `fromLegacyPlacement` from the
|
|
12
|
+
* public entry-point so the offset-tuple translation is applied consistently.
|
|
13
|
+
*
|
|
14
|
+
* Note: `auto`, `auto-start`, `auto-end` map to `block-end` placements. This
|
|
15
|
+
* is a reduction in expressiveness vs Popper.js (which picked the best
|
|
16
|
+
* placement at runtime). CSS `position-try-fallbacks` flips at the edge but
|
|
17
|
+
* the initial placement is fixed. Migration consumers who relied on Popper's
|
|
18
|
+
* dynamic auto-flip should pick an explicit placement instead.
|
|
19
|
+
*/
|
|
20
|
+
// eslint-disable-next-line @atlaskit/volt-strict-mode/no-multiple-exports
|
|
21
|
+
export var placementMapping = {
|
|
22
|
+
top: {
|
|
23
|
+
axis: 'block',
|
|
24
|
+
edge: 'start',
|
|
25
|
+
align: 'center'
|
|
26
|
+
},
|
|
27
|
+
'top-start': {
|
|
28
|
+
axis: 'block',
|
|
29
|
+
edge: 'start',
|
|
30
|
+
align: 'start'
|
|
31
|
+
},
|
|
32
|
+
'top-center': {
|
|
33
|
+
axis: 'block',
|
|
34
|
+
edge: 'start',
|
|
35
|
+
align: 'center'
|
|
36
|
+
},
|
|
37
|
+
'top-end': {
|
|
38
|
+
axis: 'block',
|
|
39
|
+
edge: 'start',
|
|
40
|
+
align: 'end'
|
|
41
|
+
},
|
|
42
|
+
bottom: {
|
|
43
|
+
axis: 'block',
|
|
44
|
+
edge: 'end',
|
|
45
|
+
align: 'center'
|
|
46
|
+
},
|
|
47
|
+
'bottom-start': {
|
|
48
|
+
axis: 'block',
|
|
49
|
+
edge: 'end',
|
|
50
|
+
align: 'start'
|
|
51
|
+
},
|
|
52
|
+
'bottom-center': {
|
|
53
|
+
axis: 'block',
|
|
54
|
+
edge: 'end',
|
|
55
|
+
align: 'center'
|
|
56
|
+
},
|
|
57
|
+
'bottom-end': {
|
|
58
|
+
axis: 'block',
|
|
59
|
+
edge: 'end',
|
|
60
|
+
align: 'end'
|
|
61
|
+
},
|
|
62
|
+
right: {
|
|
63
|
+
axis: 'inline',
|
|
64
|
+
edge: 'end',
|
|
65
|
+
align: 'center'
|
|
66
|
+
},
|
|
67
|
+
'right-start': {
|
|
68
|
+
axis: 'inline',
|
|
69
|
+
edge: 'end',
|
|
70
|
+
align: 'start'
|
|
71
|
+
},
|
|
72
|
+
'right-end': {
|
|
73
|
+
axis: 'inline',
|
|
74
|
+
edge: 'end',
|
|
75
|
+
align: 'end'
|
|
76
|
+
},
|
|
77
|
+
left: {
|
|
78
|
+
axis: 'inline',
|
|
79
|
+
edge: 'start',
|
|
80
|
+
align: 'center'
|
|
81
|
+
},
|
|
82
|
+
'left-start': {
|
|
83
|
+
axis: 'inline',
|
|
84
|
+
edge: 'start',
|
|
85
|
+
align: 'start'
|
|
86
|
+
},
|
|
87
|
+
'left-end': {
|
|
88
|
+
axis: 'inline',
|
|
89
|
+
edge: 'start',
|
|
90
|
+
align: 'end'
|
|
91
|
+
},
|
|
92
|
+
auto: {
|
|
93
|
+
axis: 'block',
|
|
94
|
+
edge: 'end',
|
|
95
|
+
align: 'center'
|
|
96
|
+
},
|
|
97
|
+
'auto-start': {
|
|
98
|
+
axis: 'block',
|
|
99
|
+
edge: 'end',
|
|
100
|
+
align: 'start'
|
|
101
|
+
},
|
|
102
|
+
'auto-end': {
|
|
103
|
+
axis: 'block',
|
|
104
|
+
edge: 'end',
|
|
105
|
+
align: 'end'
|
|
106
|
+
}
|
|
107
|
+
};
|
|
@@ -7,7 +7,6 @@ import { ax, ix } from "@compiled/react/runtime";
|
|
|
7
7
|
import React, { forwardRef, useCallback, useEffect, useId, useLayoutEffect, useRef } from 'react';
|
|
8
8
|
import { bind } from 'bind-event-listener';
|
|
9
9
|
import mergeRefs from '@atlaskit/ds-lib/merge-refs';
|
|
10
|
-
import noop from '@atlaskit/ds-lib/noop';
|
|
11
10
|
import once from '@atlaskit/ds-lib/once';
|
|
12
11
|
import { useNotifyOpenLayerObserver } from '@atlaskit/layering/experimental/open-layer-observer';
|
|
13
12
|
import { useAnimatedVisibility } from '../internal/use-animated-visibility';
|
|
@@ -58,15 +57,14 @@ var POPUP_ROLES = new Set(['menu', 'listbox', 'dialog', 'alertdialog', 'tree', '
|
|
|
58
57
|
*
|
|
59
58
|
* For `mode="auto"`, the browser can dismiss the popover via light dismiss
|
|
60
59
|
* (Escape, click outside). When that happens, `onClose` is called and the
|
|
61
|
-
* consumer must set `isOpen` to `false`. The DOM owns the dismiss
|
|
60
|
+
* consumer must set `isOpen` to `false`. The DOM owns the dismiss; React
|
|
62
61
|
* must follow.
|
|
63
62
|
*/
|
|
64
63
|
export var Popover = /*#__PURE__*/forwardRef(function Popover(_ref, ref) {
|
|
65
64
|
var children = _ref.children,
|
|
66
65
|
_ref$mode = _ref.mode,
|
|
67
66
|
modeProp = _ref$mode === void 0 ? 'auto' : _ref$mode,
|
|
68
|
-
|
|
69
|
-
onClose = _ref$onClose === void 0 ? noop : _ref$onClose,
|
|
67
|
+
onClose = _ref.onClose,
|
|
70
68
|
onOpenChange = _ref.onOpenChange,
|
|
71
69
|
onExitFinish = _ref.onExitFinish,
|
|
72
70
|
animate = _ref.animate,
|
|
@@ -81,7 +79,7 @@ export var Popover = /*#__PURE__*/forwardRef(function Popover(_ref, ref) {
|
|
|
81
79
|
var autoId = useId();
|
|
82
80
|
var ownRef = useRef(null);
|
|
83
81
|
var combinedRef = mergeRefs([ownRef, ref].filter(Boolean));
|
|
84
|
-
// Regex is intentional
|
|
82
|
+
// Regex is intentional: `replaceAll` is not available in our supported
|
|
85
83
|
// browser matrix. In React 18, `useId()` returns IDs containing colons
|
|
86
84
|
// (e.g. `:r1:`) which are invalid in CSS selectors and `popover` target
|
|
87
85
|
// attributes. React 19.2.0 replaced colons with underscores, making this
|
|
@@ -99,7 +97,7 @@ export var Popover = /*#__PURE__*/forwardRef(function Popover(_ref, ref) {
|
|
|
99
97
|
// ── Focus management ──
|
|
100
98
|
// Initial focus: on open, moves focus into the popover (role-dependent).
|
|
101
99
|
// Focus wrap: Tab/Shift+Tab cycle within the popover for dialog roles.
|
|
102
|
-
// Focus restoration: handled natively by the Popover API
|
|
100
|
+
// Focus restoration: handled natively by the Popover API. The browser
|
|
103
101
|
// tracks `previouslyFocusedElement` on show and restores it on hide.
|
|
104
102
|
// No custom restoration hook is needed. See: notes/architecture/focus-restoration.md
|
|
105
103
|
useFocusWrap({
|
|
@@ -120,7 +118,7 @@ export var Popover = /*#__PURE__*/forwardRef(function Popover(_ref, ref) {
|
|
|
120
118
|
// Passive/informational roles (tooltip, note, status, alert, log) and
|
|
121
119
|
// no-role cases do not map to LayerType 'popup', so type is left undefined.
|
|
122
120
|
var handleObserverClose = useCallback(function () {
|
|
123
|
-
onClose({
|
|
121
|
+
onClose === null || onClose === void 0 || onClose({
|
|
124
122
|
reason: 'programmatic'
|
|
125
123
|
});
|
|
126
124
|
}, [onClose]);
|
|
@@ -142,8 +140,8 @@ export var Popover = /*#__PURE__*/forwardRef(function Popover(_ref, ref) {
|
|
|
142
140
|
var mode = modeProp === 'hint' && !supportsPopoverHint() ? 'auto' : modeProp;
|
|
143
141
|
|
|
144
142
|
// Distinguishes programmatic hidePopover() from browser-initiated dismiss.
|
|
145
|
-
// When we call hidePopover() ourselves the beforetoggle event fires synchronously
|
|
146
|
-
// this ref prevents the toggle handler from calling onClose redundantly.
|
|
143
|
+
// When we call hidePopover() ourselves the beforetoggle event fires synchronously,
|
|
144
|
+
// so this ref prevents the toggle handler from calling onClose redundantly.
|
|
147
145
|
var programmaticCloseRef = useRef(false);
|
|
148
146
|
|
|
149
147
|
// Escape key tracking: set in a capture-phase keydown listener (fires before
|
|
@@ -176,7 +174,11 @@ export var Popover = /*#__PURE__*/forwardRef(function Popover(_ref, ref) {
|
|
|
176
174
|
// Browser dismiss (Escape or click-outside). Notify consumer.
|
|
177
175
|
var reason = closeReasonRef.current;
|
|
178
176
|
closeReasonRef.current = 'light-dismiss'; // reset for next dismiss
|
|
179
|
-
onClose
|
|
177
|
+
// `onClose` is required for `auto`/`hint` and forbidden for
|
|
178
|
+
// `manual`, but `TPopoverForwardedProps` is a flat type used
|
|
179
|
+
// internally by `PopupContent` - the optional check guards
|
|
180
|
+
// the manual-mode forwarded path where the field is undefined.
|
|
181
|
+
onClose === null || onClose === void 0 || onClose({
|
|
180
182
|
reason: reason
|
|
181
183
|
});
|
|
182
184
|
}
|
|
@@ -211,7 +213,7 @@ export var Popover = /*#__PURE__*/forwardRef(function Popover(_ref, ref) {
|
|
|
211
213
|
|
|
212
214
|
// Placement-dependent animation CSS vars (e.g. slide direction).
|
|
213
215
|
// Separate from show/hide so that preset reference changes
|
|
214
|
-
// (e.g. inline `animate={slideAndFade()}`)
|
|
216
|
+
// (e.g. inline `animate={slideAndFade()}`) do not re-trigger visibility.
|
|
215
217
|
useLayoutEffect(function () {
|
|
216
218
|
var el = ownRef.current;
|
|
217
219
|
if (!el || !(preset !== null && preset !== void 0 && preset.getProperties) || !placement) {
|
|
@@ -233,7 +235,7 @@ export var Popover = /*#__PURE__*/forwardRef(function Popover(_ref, ref) {
|
|
|
233
235
|
// in the target state (e.g. browser dismissed via light-dismiss before our
|
|
234
236
|
// effect ran).
|
|
235
237
|
// Defensive try/catch: these APIs throw InvalidStateError if the element
|
|
236
|
-
// is disconnected or missing the popover attribute. While we
|
|
238
|
+
// is disconnected or missing the popover attribute. While we do not expect
|
|
237
239
|
// that to happen in normal usage, it can occur in edge cases (e.g. React
|
|
238
240
|
// concurrent mode, StrictMode double-effects, or unmount races).
|
|
239
241
|
useLayoutEffect(function () {
|
|
@@ -3,7 +3,7 @@ import _extends from "@babel/runtime/helpers/extends";
|
|
|
3
3
|
import { ax, ix } from "@compiled/react/runtime";
|
|
4
4
|
import React, { forwardRef, useCallback, useLayoutEffect, useRef } from 'react';
|
|
5
5
|
import mergeRefs from '@atlaskit/ds-lib/merge-refs';
|
|
6
|
-
import { roleToAriaHasPopup } from '../internal/role-types';
|
|
6
|
+
import { roleToAriaHasPopup, shouldFocusIntoPopover } from '../internal/role-types';
|
|
7
7
|
import { useAnchorPosition } from '../internal/use-anchor-position';
|
|
8
8
|
import { useWidthFromAnchor } from '../internal/use-width-from-anchor';
|
|
9
9
|
import { Popover } from '../popover/popover';
|
|
@@ -31,7 +31,8 @@ export var PopupContent = /*#__PURE__*/forwardRef(function PopupContent(_ref, re
|
|
|
31
31
|
placementProp = _ref.placement,
|
|
32
32
|
onCloseProp = _ref.onClose,
|
|
33
33
|
testIdProp = _ref.testId,
|
|
34
|
-
forceFallbackPositioningProp = _ref.forceFallbackPositioning
|
|
34
|
+
forceFallbackPositioningProp = _ref.forceFallbackPositioning,
|
|
35
|
+
idProp = _ref.id;
|
|
35
36
|
// When inside <Popup>, context provides defaults. Props always win.
|
|
36
37
|
var ctx = useMaybePopupContext();
|
|
37
38
|
var triggerRef = triggerRefProp !== null && triggerRefProp !== void 0 ? triggerRefProp : ctx === null || ctx === void 0 ? void 0 : ctx.triggerRef;
|
|
@@ -74,7 +75,7 @@ export var PopupContent = /*#__PURE__*/forwardRef(function PopupContent(_ref, re
|
|
|
74
75
|
// does not restore focus when they close.
|
|
75
76
|
//
|
|
76
77
|
// To handle this, we listen for the close transition via `onOpenChange` and
|
|
77
|
-
// restore focus to the trigger if the browser
|
|
78
|
+
// restore focus to the trigger if the browser did not. This runs after the
|
|
78
79
|
// browser's native restoration (which happens synchronously during hidePopover),
|
|
79
80
|
// so it only takes effect when the browser skipped restoration (nested case).
|
|
80
81
|
//
|
|
@@ -91,7 +92,7 @@ export var PopupContent = /*#__PURE__*/forwardRef(function PopupContent(_ref, re
|
|
|
91
92
|
// focus when they close.
|
|
92
93
|
//
|
|
93
94
|
// We detect this case by checking if focus is still inside the
|
|
94
|
-
// closing popover element. If it is, the browser
|
|
95
|
+
// closing popover element. If it is, the browser did not restore,
|
|
95
96
|
// and we need to move focus to the trigger ourselves.
|
|
96
97
|
//
|
|
97
98
|
// This does NOT fire for:
|
|
@@ -100,13 +101,15 @@ export var PopupContent = /*#__PURE__*/forwardRef(function PopupContent(_ref, re
|
|
|
100
101
|
if (!args.isOpen) {
|
|
101
102
|
var trigger = triggerRef === null || triggerRef === void 0 ? void 0 : triggerRef.current;
|
|
102
103
|
var focusStillInPopover = trigger && args.element.contains(document.activeElement);
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
104
|
+
// Single source of truth for "this role moves focus on open
|
|
105
|
+
// and therefore needs to be restored on close" - see
|
|
106
|
+
// `shouldFocusIntoPopover` in `internal/role-types.tsx`.
|
|
107
|
+
if (focusStillInPopover && shouldFocusIntoPopover({
|
|
108
|
+
role: role
|
|
109
|
+
})) {
|
|
110
|
+
trigger.focus({
|
|
111
|
+
preventScroll: true
|
|
112
|
+
});
|
|
110
113
|
}
|
|
111
114
|
}
|
|
112
115
|
}, [setIsOpen, consumerOnOpenChange, triggerRef, role]);
|
|
@@ -136,8 +139,8 @@ export var PopupContent = /*#__PURE__*/forwardRef(function PopupContent(_ref, re
|
|
|
136
139
|
var combinedRef = mergeRefs([popoverRef, ref]);
|
|
137
140
|
|
|
138
141
|
// TPopupContentProps already validates the discriminated union (role + label,
|
|
139
|
-
// mode + onClose) at its API boundary. Popover accepts
|
|
140
|
-
// internally so individual prop forwarding
|
|
142
|
+
// mode + onClose) at its API boundary. Popover accepts TPopoverForwardedProps
|
|
143
|
+
// internally so individual prop forwarding does not need to re-prove the union.
|
|
141
144
|
var popoverProps = {
|
|
142
145
|
isOpen: isOpen,
|
|
143
146
|
animate: animate,
|
|
@@ -150,7 +153,10 @@ export var PopupContent = /*#__PURE__*/forwardRef(function PopupContent(_ref, re
|
|
|
150
153
|
onOpenChange: handleOpenChange,
|
|
151
154
|
testId: testId,
|
|
152
155
|
children: children,
|
|
153
|
-
|
|
156
|
+
// Standalone consumers can pass an explicit `id` - used by their own
|
|
157
|
+
// trigger to wire `aria-controls`. Inside the `<Popup>` compound, the
|
|
158
|
+
// id flows from context (`ctx.popoverId`).
|
|
159
|
+
id: idProp !== null && idProp !== void 0 ? idProp : ctx === null || ctx === void 0 ? void 0 : ctx.popoverId,
|
|
154
160
|
xcss: xcss
|
|
155
161
|
};
|
|
156
162
|
return /*#__PURE__*/React.createElement(Popover, _extends({
|
|
@@ -14,6 +14,12 @@ var styles = {
|
|
|
14
14
|
* should use `Popup.Content` without wrapping in `PopupSurface`.
|
|
15
15
|
*
|
|
16
16
|
* Exposed as `Popup.Surface` on the compound component.
|
|
17
|
+
*
|
|
18
|
+
* **Presentational primitive - `children`-only by design.** This component
|
|
19
|
+
* intentionally exposes no `style`, `className`, `xcss`, `id`, or `ref`
|
|
20
|
+
* props. If you need any of those, render your own wrapper element inside
|
|
21
|
+
* `Popup.Content` instead - `PopupSurface` is the no-config "give me the
|
|
22
|
+
* default ADS overlay look" surface, nothing more.
|
|
17
23
|
*/
|
|
18
24
|
export function PopupSurface(_ref) {
|
|
19
25
|
var children = _ref.children;
|
|
@@ -8,7 +8,7 @@ import { usePopupContext } from './popup-context';
|
|
|
8
8
|
/**
|
|
9
9
|
* Render-prop alternative to `Popup.Trigger`.
|
|
10
10
|
*
|
|
11
|
-
* Use when you need full control over the trigger element
|
|
11
|
+
* Use when you need full control over the trigger element. For example,
|
|
12
12
|
* to compose your own trigger with custom event handlers, wrap a third-party
|
|
13
13
|
* component, or build a trigger from multiple elements.
|
|
14
14
|
*
|
|
@@ -2,24 +2,15 @@ import React, { isValidElement, useCallback } from 'react';
|
|
|
2
2
|
import { Slot } from '../internal/slot';
|
|
3
3
|
import { usePopupContext } from './popup-context';
|
|
4
4
|
/**
|
|
5
|
-
* Wraps
|
|
6
|
-
*
|
|
7
|
-
*
|
|
5
|
+
* Wraps a single trigger element via `cloneElement`. Attaches aria
|
|
6
|
+
* attributes, the toggle handler, and the anchor-name. `aria-haspopup`
|
|
7
|
+
* is derived from `Popup.Content`'s role via context.
|
|
8
8
|
*
|
|
9
|
-
*
|
|
10
|
-
* (
|
|
11
|
-
*
|
|
12
|
-
*
|
|
13
|
-
*
|
|
14
|
-
* **Limitation:** Uses `cloneElement` internally (via `Slot`), which is
|
|
15
|
-
* incompatible with Compiled's `css` prop on the direct child element.
|
|
16
|
-
* The `@jsx jsx` pragma transforms the child before `cloneElement` can
|
|
17
|
-
* inject `onClick` and `ref` onto the DOM node, preventing the popover
|
|
18
|
-
* from opening.
|
|
19
|
-
*
|
|
20
|
-
* If you need Compiled `css` on the trigger, use `Popup.TriggerFunction`
|
|
21
|
-
* instead - it hands you raw props via a render-prop and avoids
|
|
22
|
-
* `cloneElement` entirely.
|
|
9
|
+
* Child constraints: must be a single ref-forwarding element. The child's
|
|
10
|
+
* `onClick` is composed (runs after); other event handlers are NOT.
|
|
11
|
+
* Children using Compiled's `css` prop swallow injected props - use
|
|
12
|
+
* `Popup.TriggerFunction` for these cases or any time you need handler
|
|
13
|
+
* composition.
|
|
23
14
|
*/
|
|
24
15
|
export function PopupTrigger(_ref) {
|
|
25
16
|
var children = _ref.children;
|
|
@@ -31,35 +22,24 @@ export function PopupTrigger(_ref) {
|
|
|
31
22
|
ariaHasPopup = _usePopupContext.ariaHasPopup;
|
|
32
23
|
var childOnClick = /*#__PURE__*/isValidElement(children) ? children.props.onClick : undefined;
|
|
33
24
|
|
|
34
|
-
//
|
|
35
|
-
//
|
|
36
|
-
// the handler on every open/close, breaking cloneElement identity).
|
|
25
|
+
// Track latest isOpen via ref so the click handler keeps a stable
|
|
26
|
+
// identity (cloneElement relies on it).
|
|
37
27
|
var isOpenRef = React.useRef(isOpen);
|
|
38
28
|
isOpenRef.current = isOpen;
|
|
39
29
|
var handleClick = useCallback(function (event) {
|
|
40
30
|
var popoverEl = popoverRef.current;
|
|
41
31
|
if (popoverEl) {
|
|
42
|
-
//
|
|
43
|
-
//
|
|
44
|
-
//
|
|
45
|
-
//
|
|
46
|
-
//
|
|
47
|
-
// We use React's `isOpen` state (via ref) rather than the DOM
|
|
48
|
-
// state to determine intent:
|
|
49
|
-
// - If React thinks it was open → the user wants to close.
|
|
50
|
-
// The browser already did this via light-dismiss, so do nothing.
|
|
51
|
-
// - If React thinks it was closed → the user wants to open.
|
|
52
|
-
// Call showPopover().
|
|
32
|
+
// `popover="auto"` light-dismiss can close the popover BEFORE
|
|
33
|
+
// our click handler runs, so trust React's isOpen rather than
|
|
34
|
+
// DOM state. If React still thinks it is closed, open it; if
|
|
35
|
+
// it was open, the browser already closed it.
|
|
53
36
|
if (!isOpenRef.current) {
|
|
54
|
-
// Defensive: element may be disconnected or in an unexpected state.
|
|
55
37
|
try {
|
|
56
38
|
popoverEl.showPopover();
|
|
57
|
-
} catch (_unused) {
|
|
39
|
+
} catch (_unused) {
|
|
40
|
+
// Element may be disconnected; ignore.
|
|
41
|
+
}
|
|
58
42
|
}
|
|
59
|
-
// When isOpenRef.current is true, the browser's light-dismiss
|
|
60
|
-
// already closed the popover and fired the toggle event, which
|
|
61
|
-
// will update React state via handleToggle → setIsOpen(false).
|
|
62
|
-
// No action needed here.
|
|
63
43
|
}
|
|
64
44
|
childOnClick === null || childOnClick === void 0 || childOnClick(event);
|
|
65
45
|
}, [popoverRef, childOnClick]);
|
package/dist/esm/popup/popup.js
CHANGED
|
@@ -2,10 +2,10 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
|
|
|
2
2
|
import React, { useCallback, useId, useRef, useState } from 'react';
|
|
3
3
|
import { PopupProvider } from './popup-context';
|
|
4
4
|
/**
|
|
5
|
-
* Popup compound
|
|
5
|
+
* Popup compound: trigger + popover content.
|
|
6
6
|
*
|
|
7
7
|
* Use when a button opens anchored content (dropdown, menu, dialog).
|
|
8
|
-
* The browser manages visibility via `togglePopover()
|
|
8
|
+
* The browser manages visibility via `togglePopover()`; the consumer
|
|
9
9
|
* never manages `isOpen`. For custom trigger lifecycles (hover, timers,
|
|
10
10
|
* external state), use `Popover` directly instead.
|
|
11
11
|
*
|
|
@@ -13,18 +13,24 @@ import { PopupProvider } from './popup-context';
|
|
|
13
13
|
* `Popup.Content` reads and forwards to the underlying `Popover`.
|
|
14
14
|
*/
|
|
15
15
|
export function PopupRoot(props) {
|
|
16
|
-
var _props$mode;
|
|
17
|
-
var
|
|
18
|
-
children = props.children,
|
|
16
|
+
var _props$placement, _props$mode;
|
|
17
|
+
var children = props.children,
|
|
19
18
|
testId = props.testId,
|
|
20
19
|
forceFallbackPositioning = props.forceFallbackPositioning,
|
|
21
20
|
onOpenChange = props.onOpenChange;
|
|
21
|
+
// `{}` resolves to "below the trigger, centered, with `space.100` gap"
|
|
22
|
+
// inside `useAnchorPosition`, which is the common case.
|
|
23
|
+
var placement = (_props$placement = props.placement) !== null && _props$placement !== void 0 ? _props$placement : {};
|
|
22
24
|
var mode = (_props$mode = props.mode) !== null && _props$mode !== void 0 ? _props$mode : 'auto';
|
|
23
|
-
|
|
25
|
+
|
|
26
|
+
// `TPopupProps` discriminates on `mode`: `manual` types `onClose` as
|
|
27
|
+
// `never`, so for manual consumers `props.onClose` is always `undefined`
|
|
28
|
+
// here. No runtime guard needed; the type contract carries the rule.
|
|
29
|
+
var onClose = props.onClose;
|
|
24
30
|
var id = useId();
|
|
25
|
-
//
|
|
26
|
-
//
|
|
27
|
-
//
|
|
31
|
+
// `useId()` returns IDs containing colons (`:r1:`), which are invalid
|
|
32
|
+
// in CSS selectors and `popover` target attributes. `replaceAll` is
|
|
33
|
+
// not in our browser matrix.
|
|
28
34
|
var sanitizedId = id.replace(/:/g, '');
|
|
29
35
|
var popoverId = "popover-".concat(sanitizedId);
|
|
30
36
|
var triggerRef = useRef(null);
|
|
@@ -33,6 +39,8 @@ export function PopupRoot(props) {
|
|
|
33
39
|
_useState2 = _slicedToArray(_useState, 2),
|
|
34
40
|
isOpen = _useState2[0],
|
|
35
41
|
setIsOpen = _useState2[1];
|
|
42
|
+
// Initial seed before `Popup.Content`'s layout effect resolves the
|
|
43
|
+
// real role on first paint.
|
|
36
44
|
var _useState3 = useState('dialog'),
|
|
37
45
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
38
46
|
ariaHasPopup = _useState4[0],
|
|
@@ -43,7 +51,10 @@ export function PopupRoot(props) {
|
|
|
43
51
|
var contextValue = {
|
|
44
52
|
popoverId: popoverId,
|
|
45
53
|
placement: placement,
|
|
46
|
-
|
|
54
|
+
// `null` when the consumer did not supply a handler (manual mode, or
|
|
55
|
+
// auto/hint without a light-dismiss handler). `Popup.Content` reads
|
|
56
|
+
// this to decide whether to forward an `onClose` to `Popover`.
|
|
57
|
+
onClose: onClose ? handleClose : null,
|
|
47
58
|
triggerRef: triggerRef,
|
|
48
59
|
popoverRef: popoverRef,
|
|
49
60
|
isOpen: isOpen,
|