@instructure/ui-drawer-layout 8.33.1 → 8.33.2-snapshot-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 +8 -0
- package/es/DrawerLayout/DrawerContent/DrawerContentLocator.js +3 -1
- package/es/DrawerLayout/DrawerContent/index.js +7 -26
- package/es/DrawerLayout/DrawerContent/props.js +1 -0
- package/es/DrawerLayout/DrawerContent/styles.js +0 -1
- package/es/DrawerLayout/DrawerContent/theme.js +0 -1
- package/es/DrawerLayout/DrawerLayoutLocator.js +3 -3
- package/es/DrawerLayout/DrawerTray/DrawerTrayLocator.js +3 -1
- package/es/DrawerLayout/DrawerTray/index.js +33 -64
- package/es/DrawerLayout/DrawerTray/props.js +1 -0
- package/es/DrawerLayout/DrawerTray/styles.js +0 -1
- package/es/DrawerLayout/DrawerTray/theme.js +5 -5
- package/es/DrawerLayout/__examples__/DrawerLayout.examples.js +1 -1
- package/es/DrawerLayout/__fixtures__/DrawerLayout.fixture.js +6 -7
- package/es/DrawerLayout/index.js +3 -41
- package/es/DrawerLayout/locator.js +1 -0
- package/es/DrawerLayout/props.js +1 -0
- package/es/DrawerLayout/styles.js +0 -1
- package/es/index.js +1 -0
- package/lib/DrawerLayout/DrawerContent/DrawerContentLocator.js +1 -3
- package/lib/DrawerLayout/DrawerContent/index.js +7 -36
- package/lib/DrawerLayout/DrawerContent/props.js +1 -3
- package/lib/DrawerLayout/DrawerContent/styles.js +0 -2
- package/lib/DrawerLayout/DrawerContent/theme.js +0 -2
- package/lib/DrawerLayout/DrawerLayoutLocator.js +1 -7
- package/lib/DrawerLayout/DrawerTray/DrawerTrayLocator.js +1 -3
- package/lib/DrawerLayout/DrawerTray/index.js +33 -78
- package/lib/DrawerLayout/DrawerTray/props.js +1 -5
- package/lib/DrawerLayout/DrawerTray/styles.js +0 -2
- package/lib/DrawerLayout/DrawerTray/theme.js +5 -6
- package/lib/DrawerLayout/__examples__/DrawerLayout.examples.js +0 -6
- package/lib/DrawerLayout/__fixtures__/DrawerLayout.fixture.js +5 -14
- package/lib/DrawerLayout/index.js +3 -62
- package/lib/DrawerLayout/locator.js +0 -2
- package/lib/DrawerLayout/props.js +1 -7
- package/lib/DrawerLayout/styles.js +0 -2
- package/lib/index.js +0 -1
- package/package.json +21 -21
- package/tsconfig.build.tsbuildinfo +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,14 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [8.33.2-snapshot-5](https://github.com/instructure/instructure-ui/compare/v8.33.1...v8.33.2-snapshot-5) (2023-01-23)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @instructure/ui-drawer-layout
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
6
14
|
## [8.33.1](https://github.com/instructure/instructure-ui/compare/v8.33.0...v8.33.1) (2023-01-06)
|
|
7
15
|
|
|
8
16
|
**Note:** Version bump only for package @instructure/ui-drawer-layout
|
|
@@ -21,7 +21,9 @@
|
|
|
21
21
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
22
22
|
* SOFTWARE.
|
|
23
23
|
*/
|
|
24
|
+
|
|
24
25
|
import { locator } from '@instructure/ui-test-locator';
|
|
25
|
-
import { DrawerContent } from './index';
|
|
26
|
+
import { DrawerContent } from './index';
|
|
26
27
|
|
|
28
|
+
// @ts-expect-error ts-migrate(2339) FIXME: Property 'selector' does not exist on type 'typeof... Remove this comment to see the full error message
|
|
27
29
|
export const DrawerContentLocator = locator(DrawerContent.selector);
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
var _dec, _dec2, _class, _class2;
|
|
2
|
-
|
|
3
2
|
/*
|
|
4
3
|
* The MIT License (MIT)
|
|
5
4
|
*
|
|
@@ -34,7 +33,6 @@ import { withStyle, jsx } from '@instructure/emotion';
|
|
|
34
33
|
import generateStyle from './styles';
|
|
35
34
|
import generateComponentTheme from './theme';
|
|
36
35
|
import { propTypes, allowedProps } from './props';
|
|
37
|
-
|
|
38
36
|
/**
|
|
39
37
|
---
|
|
40
38
|
parent: DrawerLayout
|
|
@@ -48,85 +46,69 @@ let DrawerContent = (_dec = withStyle(generateStyle, generateComponentTheme), _d
|
|
|
48
46
|
this.ref = null;
|
|
49
47
|
this._resizeListener = void 0;
|
|
50
48
|
this._debounced = void 0;
|
|
51
|
-
|
|
52
49
|
this.makeStyleProps = shouldTransition => {
|
|
53
50
|
return {
|
|
54
51
|
shouldTransition
|
|
55
52
|
};
|
|
56
53
|
};
|
|
57
|
-
|
|
58
54
|
this.handleContentRef = node => {
|
|
59
55
|
this.ref = node;
|
|
60
|
-
|
|
61
56
|
if (typeof this.props.contentRef === 'function') {
|
|
62
57
|
this.props.contentRef(node);
|
|
63
58
|
}
|
|
64
59
|
};
|
|
65
60
|
}
|
|
66
|
-
|
|
67
61
|
get _content() {
|
|
68
62
|
return this.ref;
|
|
69
63
|
}
|
|
70
|
-
|
|
71
64
|
componentDidMount() {
|
|
72
65
|
var _this$props$makeStyle, _this$props;
|
|
73
|
-
|
|
74
66
|
const rect = getBoundingClientRect(this.ref);
|
|
75
67
|
const origSize = {
|
|
76
68
|
width: rect.width
|
|
77
|
-
};
|
|
78
|
-
|
|
69
|
+
};
|
|
70
|
+
// set initial size
|
|
79
71
|
if (typeof this.props.onSizeChange === 'function') {
|
|
80
72
|
this.props.onSizeChange({
|
|
81
73
|
width: rect.width,
|
|
82
74
|
height: rect.height
|
|
83
|
-
});
|
|
75
|
+
});
|
|
84
76
|
|
|
77
|
+
// listen for changes to size
|
|
85
78
|
this._debounced = debounce(this.props.onSizeChange, 100, {
|
|
86
79
|
leading: false,
|
|
87
80
|
trailing: true
|
|
88
81
|
});
|
|
89
82
|
}
|
|
90
|
-
|
|
91
83
|
this._resizeListener = new ResizeObserver(entries => {
|
|
92
84
|
for (const entry of entries) {
|
|
93
85
|
const size = {
|
|
94
86
|
width: entry.contentRect.width
|
|
95
87
|
};
|
|
96
|
-
|
|
97
88
|
if (size.width !== origSize.width) {
|
|
98
89
|
var _this$_debounced;
|
|
99
|
-
|
|
100
90
|
(_this$_debounced = this._debounced) === null || _this$_debounced === void 0 ? void 0 : _this$_debounced.call(this, size);
|
|
101
91
|
}
|
|
102
92
|
}
|
|
103
93
|
});
|
|
104
|
-
|
|
105
94
|
this._resizeListener.observe(this.ref);
|
|
106
|
-
|
|
107
95
|
(_this$props$makeStyle = (_this$props = this.props).makeStyles) === null || _this$props$makeStyle === void 0 ? void 0 : _this$props$makeStyle.call(_this$props, this.makeStyleProps(false));
|
|
108
96
|
}
|
|
109
|
-
|
|
110
97
|
componentDidUpdate() {
|
|
111
98
|
var _this$props$makeStyle2, _this$props2;
|
|
112
|
-
|
|
113
99
|
(_this$props$makeStyle2 = (_this$props2 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props2, this.makeStyleProps(true));
|
|
114
100
|
}
|
|
115
|
-
|
|
116
101
|
componentWillUnmount() {
|
|
117
102
|
var _this$_resizeListener, _this$_debounced2;
|
|
118
|
-
|
|
119
103
|
(_this$_resizeListener = this._resizeListener) === null || _this$_resizeListener === void 0 ? void 0 : _this$_resizeListener.disconnect();
|
|
120
104
|
(_this$_debounced2 = this._debounced) === null || _this$_debounced2 === void 0 ? void 0 : _this$_debounced2.cancel();
|
|
121
105
|
}
|
|
122
|
-
|
|
123
106
|
render() {
|
|
124
107
|
var _this$props$styles;
|
|
125
|
-
|
|
126
108
|
const _this$props3 = this.props,
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
109
|
+
style = _this$props3.style,
|
|
110
|
+
label = _this$props3.label,
|
|
111
|
+
role = _this$props3.role;
|
|
130
112
|
return jsx("div", Object.assign({}, omitProps(this.props, DrawerContent.allowedProps), {
|
|
131
113
|
role: role,
|
|
132
114
|
style: style,
|
|
@@ -135,7 +117,6 @@ let DrawerContent = (_dec = withStyle(generateStyle, generateComponentTheme), _d
|
|
|
135
117
|
css: (_this$props$styles = this.props.styles) === null || _this$props$styles === void 0 ? void 0 : _this$props$styles.drawerContent
|
|
136
118
|
}), this.props.children);
|
|
137
119
|
}
|
|
138
|
-
|
|
139
120
|
}, _class2.displayName = "DrawerContent", _class2.componentId = 'DrawerLayout.Content', _class2.locatorAttribute = 'data-drawer-content', _class2.propTypes = propTypes, _class2.allowedProps = allowedProps, _class2.defaultProps = {
|
|
140
121
|
role: 'region'
|
|
141
122
|
}, _class2)) || _class) || _class);
|
|
@@ -21,12 +21,14 @@
|
|
|
21
21
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
22
22
|
* SOFTWARE.
|
|
23
23
|
*/
|
|
24
|
+
|
|
24
25
|
import { locator } from '@instructure/ui-test-locator';
|
|
25
26
|
import { DrawerLayout } from './index';
|
|
26
27
|
import { DrawerContentLocator } from './DrawerContent/DrawerContentLocator';
|
|
27
28
|
import { DrawerTrayLocator } from './DrawerTray/DrawerTrayLocator';
|
|
28
|
-
export { DrawerContentLocator, DrawerTrayLocator };
|
|
29
|
+
export { DrawerContentLocator, DrawerTrayLocator };
|
|
29
30
|
|
|
31
|
+
// @ts-expect-error ts-migrate(2339) FIXME: Property 'selector' does not exist on type 'typeof... Remove this comment to see the full error message
|
|
30
32
|
export const DrawerLayoutLocator = locator(DrawerLayout.selector, {
|
|
31
33
|
findContent: function () {
|
|
32
34
|
return DrawerContentLocator.find(...arguments);
|
|
@@ -34,11 +36,9 @@ export const DrawerLayoutLocator = locator(DrawerLayout.selector, {
|
|
|
34
36
|
findTray: function (element) {
|
|
35
37
|
if (element && element.getAttribute) {
|
|
36
38
|
const id = element.getAttribute(DrawerLayout.locatorAttribute);
|
|
37
|
-
|
|
38
39
|
for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
|
|
39
40
|
args[_key - 1] = arguments[_key];
|
|
40
41
|
}
|
|
41
|
-
|
|
42
42
|
return locator(`[${DrawerLayout.Tray.locatorAttribute}="${id}"]`).find(...args);
|
|
43
43
|
} else {
|
|
44
44
|
return null;
|
|
@@ -21,7 +21,9 @@
|
|
|
21
21
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
22
22
|
* SOFTWARE.
|
|
23
23
|
*/
|
|
24
|
+
|
|
24
25
|
import { locator } from '@instructure/ui-test-locator';
|
|
25
|
-
import { DrawerTray } from './index';
|
|
26
|
+
import { DrawerTray } from './index';
|
|
26
27
|
|
|
28
|
+
// @ts-expect-error ts-migrate(2339) FIXME: Property 'selector' does not exist on type 'typeof... Remove this comment to see the full error message
|
|
27
29
|
export const DrawerTrayLocator = locator(DrawerTray.selector);
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
|
2
2
|
const _excluded = ["label", "children", "render", "placement", "open", "onOpen", "onClose", "border", "shadow", "onEnter", "onEntering", "onEntered", "onExit", "onExiting", "onExited", "contentRef", "mountNode", "defaultFocusElement", "liveRegion", "onDismiss", "onTransition", "shouldReturnFocus", "shouldCloseOnEscape", "shouldCloseOnDocumentClick", "shouldContainFocus", "styles"];
|
|
3
|
-
|
|
4
3
|
var _dec, _dec2, _dec3, _class, _class2;
|
|
5
|
-
|
|
6
4
|
/*
|
|
7
5
|
* The MIT License (MIT)
|
|
8
6
|
*
|
|
@@ -26,7 +24,6 @@ var _dec, _dec2, _dec3, _class, _class2;
|
|
|
26
24
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
27
25
|
* SOFTWARE.
|
|
28
26
|
*/
|
|
29
|
-
|
|
30
27
|
/** @jsx jsx */
|
|
31
28
|
import { Component } from 'react';
|
|
32
29
|
import { withStyle, jsx } from '@instructure/emotion';
|
|
@@ -42,7 +39,6 @@ import generateStyle from './styles';
|
|
|
42
39
|
import generateComponentTheme from './theme';
|
|
43
40
|
import { DrawerLayoutContext } from '../index';
|
|
44
41
|
import { propTypes, allowedProps } from './props';
|
|
45
|
-
|
|
46
42
|
/**
|
|
47
43
|
---
|
|
48
44
|
parent: DrawerLayout
|
|
@@ -54,98 +50,78 @@ let DrawerTray = (_dec = withStyle(generateStyle, generateComponentTheme), _dec2
|
|
|
54
50
|
get _content() {
|
|
55
51
|
return this.ref;
|
|
56
52
|
}
|
|
57
|
-
|
|
58
53
|
constructor(props) {
|
|
59
54
|
super(props);
|
|
60
55
|
this.ref = null;
|
|
61
56
|
this._DOMNode = null;
|
|
62
|
-
|
|
63
57
|
this.makeStyleProps = () => {
|
|
64
58
|
return {
|
|
65
59
|
placement: this.placement
|
|
66
60
|
};
|
|
67
61
|
};
|
|
68
|
-
|
|
69
62
|
this.handleContentRef = node => {
|
|
70
63
|
this.ref = node;
|
|
71
|
-
|
|
72
64
|
if (typeof this.props.contentRef === 'function') {
|
|
73
65
|
this.props.contentRef(node);
|
|
74
66
|
}
|
|
75
67
|
};
|
|
76
|
-
|
|
77
68
|
this.handleTransitionEntered = _transitionType => {
|
|
78
69
|
this.setState({
|
|
79
70
|
transitioning: false
|
|
80
71
|
});
|
|
81
72
|
};
|
|
82
|
-
|
|
83
73
|
this.handleTransitionExited = _transitionType => {
|
|
84
74
|
this.setState({
|
|
85
75
|
transitioning: false
|
|
86
76
|
});
|
|
87
77
|
};
|
|
88
|
-
|
|
89
78
|
this.handlePortalOpen = DOMNode => {
|
|
90
79
|
this.DOMNode = DOMNode;
|
|
91
80
|
this.setState({
|
|
92
81
|
portalOpen: true
|
|
93
82
|
});
|
|
94
83
|
};
|
|
95
|
-
|
|
96
84
|
this.state = {
|
|
97
85
|
transitioning: false,
|
|
98
86
|
portalOpen: false
|
|
99
87
|
};
|
|
100
88
|
}
|
|
101
|
-
|
|
102
89
|
componentDidMount() {
|
|
103
90
|
var _this$props$makeStyle, _this$props;
|
|
104
|
-
|
|
105
91
|
(_this$props$makeStyle = (_this$props = this.props).makeStyles) === null || _this$props$makeStyle === void 0 ? void 0 : _this$props$makeStyle.call(_this$props, this.makeStyleProps());
|
|
106
92
|
}
|
|
107
|
-
|
|
108
93
|
componentDidUpdate(prevProps) {
|
|
109
94
|
var _this$props$makeStyle2, _this$props2;
|
|
110
|
-
|
|
111
95
|
if (this.props.open !== prevProps.open) {
|
|
112
96
|
this.setState({
|
|
113
97
|
transitioning: true
|
|
114
98
|
});
|
|
115
99
|
}
|
|
116
|
-
|
|
117
100
|
(_this$props$makeStyle2 = (_this$props2 = this.props).makeStyles) === null || _this$props$makeStyle2 === void 0 ? void 0 : _this$props$makeStyle2.call(_this$props2, this.makeStyleProps());
|
|
118
101
|
}
|
|
119
|
-
|
|
120
102
|
get placement() {
|
|
121
103
|
const _this$props3 = this.props,
|
|
122
|
-
|
|
123
|
-
|
|
104
|
+
placement = _this$props3.placement,
|
|
105
|
+
dir = _this$props3.dir;
|
|
124
106
|
const isRtl = dir === textDirectionContextConsumer.DIRECTION.rtl;
|
|
125
107
|
return isRtl ? mirrorHorizontalPlacement(placement, ' ') : placement;
|
|
126
108
|
}
|
|
127
|
-
|
|
128
109
|
get direction() {
|
|
129
110
|
return this.placement === 'end' ? 'right' : 'left';
|
|
130
111
|
}
|
|
131
|
-
|
|
132
112
|
get transition() {
|
|
133
113
|
return `slide-${this.direction}`;
|
|
134
114
|
}
|
|
135
|
-
|
|
136
115
|
get DOMNode() {
|
|
137
116
|
return this._DOMNode;
|
|
138
117
|
}
|
|
139
|
-
|
|
140
118
|
set DOMNode(el) {
|
|
141
119
|
this._DOMNode = el;
|
|
142
120
|
}
|
|
143
|
-
|
|
144
121
|
renderContent() {
|
|
145
122
|
const _this$props4 = this.props,
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
123
|
+
children = _this$props4.children,
|
|
124
|
+
render = _this$props4.render;
|
|
149
125
|
if (typeof render === 'function') {
|
|
150
126
|
return render();
|
|
151
127
|
} else if (typeof children === 'function') {
|
|
@@ -154,52 +130,47 @@ let DrawerTray = (_dec = withStyle(generateStyle, generateComponentTheme), _dec2
|
|
|
154
130
|
return children;
|
|
155
131
|
}
|
|
156
132
|
}
|
|
157
|
-
|
|
158
133
|
render() {
|
|
159
134
|
const _this$props5 = this.props,
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
135
|
+
label = _this$props5.label,
|
|
136
|
+
children = _this$props5.children,
|
|
137
|
+
render = _this$props5.render,
|
|
138
|
+
placement = _this$props5.placement,
|
|
139
|
+
open = _this$props5.open,
|
|
140
|
+
onOpen = _this$props5.onOpen,
|
|
141
|
+
onClose = _this$props5.onClose,
|
|
142
|
+
border = _this$props5.border,
|
|
143
|
+
shadow = _this$props5.shadow,
|
|
144
|
+
onEnter = _this$props5.onEnter,
|
|
145
|
+
onEntering = _this$props5.onEntering,
|
|
146
|
+
onEntered = _this$props5.onEntered,
|
|
147
|
+
onExit = _this$props5.onExit,
|
|
148
|
+
onExiting = _this$props5.onExiting,
|
|
149
|
+
onExited = _this$props5.onExited,
|
|
150
|
+
contentRef = _this$props5.contentRef,
|
|
151
|
+
mountNode = _this$props5.mountNode,
|
|
152
|
+
defaultFocusElement = _this$props5.defaultFocusElement,
|
|
153
|
+
liveRegion = _this$props5.liveRegion,
|
|
154
|
+
onDismiss = _this$props5.onDismiss,
|
|
155
|
+
onTransition = _this$props5.onTransition,
|
|
156
|
+
shouldReturnFocus = _this$props5.shouldReturnFocus,
|
|
157
|
+
shouldCloseOnEscape = _this$props5.shouldCloseOnEscape,
|
|
158
|
+
shouldCloseOnDocumentClick = _this$props5.shouldCloseOnDocumentClick,
|
|
159
|
+
shouldContainFocus = _this$props5.shouldContainFocus,
|
|
160
|
+
styles = _this$props5.styles,
|
|
161
|
+
props = _objectWithoutProperties(_this$props5, _excluded);
|
|
188
162
|
return jsx(DrawerLayoutContext.Consumer, null, shouldOverlayTray => {
|
|
189
163
|
var _this$props$styles;
|
|
190
|
-
|
|
191
164
|
const portalOpen = this.state.portalOpen;
|
|
192
|
-
const needsPortal = shouldOverlayTray && !!mountNode;
|
|
165
|
+
const needsPortal = shouldOverlayTray && !!mountNode;
|
|
166
|
+
// we have to handle the shadow version here,
|
|
193
167
|
// because passing and handling it in styles.js makes it
|
|
194
168
|
// rerender the component during the transition, breaking it
|
|
195
|
-
|
|
196
169
|
const trayStyles = shadow && shouldOverlayTray ? styles === null || styles === void 0 ? void 0 : styles.drawerTrayWithShadow : styles === null || styles === void 0 ? void 0 : styles.drawerTray;
|
|
197
170
|
let transitionIn = open;
|
|
198
|
-
|
|
199
171
|
if (needsPortal && !portalOpen) {
|
|
200
172
|
transitionIn = false;
|
|
201
173
|
}
|
|
202
|
-
|
|
203
174
|
const content = jsx(Transition, {
|
|
204
175
|
in: transitionIn,
|
|
205
176
|
type: this.transition,
|
|
@@ -228,7 +199,6 @@ let DrawerTray = (_dec = withStyle(generateStyle, generateComponentTheme), _dec2
|
|
|
228
199
|
as: "div",
|
|
229
200
|
css: (_this$props$styles = this.props.styles) === null || _this$props$styles === void 0 ? void 0 : _this$props$styles.drawerTrayContent
|
|
230
201
|
}, this.renderContent())));
|
|
231
|
-
|
|
232
202
|
if (needsPortal) {
|
|
233
203
|
return jsx(Portal, {
|
|
234
204
|
mountNode: mountNode,
|
|
@@ -240,7 +210,6 @@ let DrawerTray = (_dec = withStyle(generateStyle, generateComponentTheme), _dec2
|
|
|
240
210
|
}
|
|
241
211
|
});
|
|
242
212
|
}
|
|
243
|
-
|
|
244
213
|
}, _class2.displayName = "DrawerTray", _class2.componentId = 'DrawerLayout.Tray', _class2.locatorAttribute = 'data-drawer-tray', _class2.propTypes = propTypes, _class2.allowedProps = allowedProps, _class2.defaultProps = {
|
|
245
214
|
shouldContainFocus: true,
|
|
246
215
|
shouldCloseOnEscape: true,
|
|
@@ -21,6 +21,7 @@
|
|
|
21
21
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
22
22
|
* SOFTWARE.
|
|
23
23
|
*/
|
|
24
|
+
|
|
24
25
|
import PropTypes from 'prop-types';
|
|
25
26
|
import { element } from '@instructure/ui-prop-types';
|
|
26
27
|
import { textDirectionContextConsumer } from '@instructure/ui-i18n';
|
|
@@ -29,9 +29,9 @@
|
|
|
29
29
|
*/
|
|
30
30
|
const generateComponentTheme = theme => {
|
|
31
31
|
const colors = theme.colors,
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
32
|
+
borders = theme.borders,
|
|
33
|
+
stacking = theme.stacking,
|
|
34
|
+
shadows = theme.shadows;
|
|
35
35
|
const componentVariables = {
|
|
36
36
|
background: colors === null || colors === void 0 ? void 0 : colors.backgroundLightest,
|
|
37
37
|
borderColor: colors === null || colors === void 0 ? void 0 : colors.borderMedium,
|
|
@@ -43,8 +43,8 @@ const generateComponentTheme = theme => {
|
|
|
43
43
|
overflowY: 'auto',
|
|
44
44
|
contentOverflowY: 'auto'
|
|
45
45
|
};
|
|
46
|
-
return {
|
|
46
|
+
return {
|
|
47
|
+
...componentVariables
|
|
47
48
|
};
|
|
48
49
|
};
|
|
49
|
-
|
|
50
50
|
export default generateComponentTheme;
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
var _DrawerLayout$Tray, _View;
|
|
2
|
-
|
|
3
2
|
/*
|
|
4
3
|
* The MIT License (MIT)
|
|
5
4
|
*
|
|
@@ -23,6 +22,7 @@ var _DrawerLayout$Tray, _View;
|
|
|
23
22
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
24
23
|
* SOFTWARE.
|
|
25
24
|
*/
|
|
25
|
+
|
|
26
26
|
import React from 'react';
|
|
27
27
|
import { View } from '@instructure/ui-view';
|
|
28
28
|
import { DrawerLayout } from '../index';
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
var _DrawerLayout$Content;
|
|
2
|
-
|
|
3
2
|
/*
|
|
4
3
|
* The MIT License (MIT)
|
|
5
4
|
*
|
|
@@ -23,17 +22,18 @@ var _DrawerLayout$Content;
|
|
|
23
22
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
24
23
|
* SOFTWARE.
|
|
25
24
|
*/
|
|
25
|
+
|
|
26
26
|
import React, { Component } from 'react';
|
|
27
27
|
import PropTypes from 'prop-types';
|
|
28
28
|
import { DrawerLayout } from '../index';
|
|
29
29
|
export default class DrawerLayoutFixture extends Component {
|
|
30
30
|
render() {
|
|
31
31
|
const _this$props = this.props,
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
32
|
+
layoutWidth = _this$props.layoutWidth,
|
|
33
|
+
trayWidth = _this$props.trayWidth,
|
|
34
|
+
open = _this$props.open,
|
|
35
|
+
placement = _this$props.placement,
|
|
36
|
+
onOverlayTrayChange = _this$props.onOverlayTrayChange;
|
|
37
37
|
return /*#__PURE__*/React.createElement("div", {
|
|
38
38
|
style: {
|
|
39
39
|
width: layoutWidth
|
|
@@ -53,7 +53,6 @@ export default class DrawerLayoutFixture extends Component {
|
|
|
53
53
|
label: "Test DrawerContent"
|
|
54
54
|
}, /*#__PURE__*/React.createElement("div", null, "Hello from content", /*#__PURE__*/React.createElement("button", null, "Expand"))))));
|
|
55
55
|
}
|
|
56
|
-
|
|
57
56
|
}
|
|
58
57
|
DrawerLayoutFixture.displayName = "DrawerLayoutFixture";
|
|
59
58
|
DrawerLayoutFixture.propTypes = {
|