@instructure/ui-buttons 11.7.8 → 11.7.9-snapshot-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.
Files changed (23) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/es/BaseButton/v1/index.js +1 -4
  3. package/es/BaseButton/v2/index.js +1 -4
  4. package/lib/BaseButton/v1/index.js +10 -16
  5. package/lib/BaseButton/v1/styles.js +4 -5
  6. package/lib/BaseButton/v1/theme.js +16 -17
  7. package/lib/BaseButton/v2/index.js +11 -16
  8. package/lib/Button/v1/index.js +3 -4
  9. package/lib/Button/v2/index.js +3 -4
  10. package/lib/CloseButton/v1/index.js +7 -8
  11. package/lib/CloseButton/v2/index.js +5 -6
  12. package/lib/CondensedButton/v1/index.js +2 -2
  13. package/lib/CondensedButton/v2/index.js +2 -2
  14. package/lib/IconButton/v1/index.js +6 -6
  15. package/lib/IconButton/v2/index.js +6 -6
  16. package/lib/ToggleButton/v1/index.js +3 -4
  17. package/lib/ToggleButton/v2/index.js +2 -2
  18. package/package.json +17 -17
  19. package/src/BaseButton/v1/index.tsx +1 -4
  20. package/src/BaseButton/v2/index.tsx +1 -4
  21. package/tsconfig.build.tsbuildinfo +1 -1
  22. package/types/BaseButton/v1/index.d.ts.map +1 -1
  23. package/types/BaseButton/v2/index.d.ts.map +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
+ ## [11.7.9-snapshot-1](https://github.com/instructure/instructure-ui/compare/v11.7.8...v11.7.9-snapshot-1) (2026-10-06)
7
+
8
+ **Note:** Version bump only for package @instructure/ui-buttons
9
+
10
+
11
+
12
+
13
+
6
14
  ## [11.7.8](https://github.com/instructure/instructure-ui/compare/v11.7.7...v11.7.8) (2026-10-02)
7
15
 
8
16
  ### Features
package/es/BaseButton/v1/index.js CHANGED
@@ -29,10 +29,7 @@ import { getElementType, getInteraction, passthroughProps, callRenderProp } from
29
29
  import { isActiveElement } from '@instructure/ui-dom-utils';
30
30
  import { hasVisibleChildren } from '@instructure/ui-a11y-utils';
31
31
  import { View } from '@instructure/ui-view/v11_6';
32
- // TODO these have to be imported in separate lines because otherwise `isSafari` will be missing from the babel build
33
- // this bug is very likely caused by `babel-plugin-transform-imports` and can be reverted once it is removed from the codebase
34
- import { isSafari, safeLinkProps } from '@instructure/ui-utils';
35
- import { combineDataCid } from '@instructure/ui-utils';
32
+ import { isSafari, safeLinkProps, combineDataCid } from '@instructure/ui-utils';
36
33
  import { withStyle } from '@instructure/emotion';
37
34
  import generateStyles from './styles.js';
38
35
  import generateComponentTheme from './theme.js';
package/es/BaseButton/v2/index.js CHANGED
@@ -30,10 +30,7 @@ import { isActiveElement } from '@instructure/ui-dom-utils';
30
30
  import { hasVisibleChildren } from '@instructure/ui-a11y-utils';
31
31
  import { renderIconWithProps } from '@instructure/ui-icons';
32
32
  import { View } from '@instructure/ui-view/latest';
33
- // TODO these have to be imported in separate lines because otherwise `isSafari` will be missing from the babel build
34
- // this bug is very likely caused by `babel-plugin-transform-imports` and can be reverted once it is removed from the codebase
35
- import { isSafari, safeLinkProps } from '@instructure/ui-utils';
36
- import { combineDataCid } from '@instructure/ui-utils';
33
+ import { isSafari, safeLinkProps, combineDataCid } from '@instructure/ui-utils';
37
34
  import { withStyleNew } from '@instructure/emotion';
38
35
  import generateStyles from './styles.js';
39
36
  import { allowedProps } from './props.js';
package/lib/BaseButton/v1/index.js CHANGED
@@ -7,15 +7,11 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.default = exports.BaseButton = void 0;
8
8
  var _react = require("react");
9
9
  var _keycode = _interopRequireDefault(require("keycode"));
10
- var _getElementType = require("@instructure/ui-react-utils/lib/getElementType.js");
11
- var _getInteraction = require("@instructure/ui-react-utils/lib/getInteraction.js");
12
- var _passthroughProps = require("@instructure/ui-react-utils/lib/passthroughProps.js");
13
- var _callRenderProp = require("@instructure/ui-react-utils/lib/callRenderProp.js");
14
- var _isActiveElement = require("@instructure/ui-dom-utils/lib/isActiveElement.js");
15
- var _hasVisibleChildren = require("@instructure/ui-a11y-utils/lib/hasVisibleChildren.js");
10
+ var _uiReactUtils = require("@instructure/ui-react-utils");
11
+ var _uiDomUtils = require("@instructure/ui-dom-utils");
12
+ var _uiA11yUtils = require("@instructure/ui-a11y-utils");
16
13
  var _v11_ = require("@instructure/ui-view/v11_6");
17
14
  var _uiUtils = require("@instructure/ui-utils");
18
- var _combineDataCid = require("@instructure/ui-utils/lib/combineDataCid.js");
19
15
  var _emotion = require("@instructure/emotion");
20
16
  var _styles = _interopRequireDefault(require("./styles.js"));
21
17
  var _theme = _interopRequireDefault(require("./theme.js"));
@@ -45,8 +41,6 @@ var _dec, _class;
45
41
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
46
42
  * SOFTWARE.
47
43
  */
48
- // TODO these have to be imported in separate lines because otherwise `isSafari` will be missing from the babel build
49
- // this bug is very likely caused by `babel-plugin-transform-imports` and can be reverted once it is removed from the codebase
50
44
  /**
51
45
  ---
52
46
  category: components/Util Components
@@ -91,13 +85,13 @@ let BaseButton = exports.BaseButton = (_dec = (0, _emotion.withStyle)(_styles.de
91
85
  children,
92
86
  renderIcon
93
87
  } = this.props;
94
- return !!(renderIcon && !(0, _hasVisibleChildren.hasVisibleChildren)(children));
88
+ return !!(renderIcon && !(0, _uiA11yUtils.hasVisibleChildren)(children));
95
89
  }
96
90
  get elementType() {
97
- return (0, _getElementType.getElementType)(BaseButton, this.props);
91
+ return (0, _uiReactUtils.getElementType)(BaseButton, this.props);
98
92
  }
99
93
  get interaction() {
100
- return (0, _getInteraction.getInteraction)({
94
+ return (0, _uiReactUtils.getInteraction)({
101
95
  props: this.props
102
96
  });
103
97
  }
@@ -132,7 +126,7 @@ let BaseButton = exports.BaseButton = (_dec = (0, _emotion.withStyle)(_styles.de
132
126
  return color.includes('inverse') ? 'inverse' : 'info';
133
127
  }
134
128
  get focused() {
135
- return (0, _isActiveElement.isActiveElement)(this.ref);
129
+ return (0, _uiDomUtils.isActiveElement)(this.ref);
136
130
  }
137
131
  focus() {
138
132
  this.ref && this.ref.focus();
@@ -209,7 +203,7 @@ let BaseButton = exports.BaseButton = (_dec = (0, _emotion.withStyle)(_styles.de
209
203
  } = this;
210
204
  const wrappedIcon = (0, _jsxRuntime.jsx)("span", {
211
205
  css: styles?.iconSVG,
212
- children: (0, _callRenderProp.callRenderProp)(renderIcon)
206
+ children: (0, _uiReactUtils.callRenderProp)(renderIcon)
213
207
  });
214
208
  const flexChildren = hasOnlyIconVisible ? (0, _jsxRuntime.jsxs)("span", {
215
209
  css: styles?.iconOnly,
@@ -284,7 +278,7 @@ let BaseButton = exports.BaseButton = (_dec = (0, _emotion.withStyle)(_styles.de
284
278
  tabIndexValue = tabIndex || 0;
285
279
  }
286
280
  return (0, _jsxRuntime.jsx)(_v11_.View, {
287
- ...(0, _passthroughProps.passthroughProps)(props),
281
+ ...(0, _uiReactUtils.passthroughProps)(props),
288
282
  as: elementType,
289
283
  focusColor: this.focusColor,
290
284
  position: "relative",
@@ -307,7 +301,7 @@ let BaseButton = exports.BaseButton = (_dec = (0, _emotion.withStyle)(_styles.de
307
301
  disabled: isDisabled || isReadOnly,
308
302
  css: styles?.baseButton,
309
303
  withFocusOutline: withFocusOutline,
310
- "data-cid": (0, _combineDataCid.combineDataCid)('BaseButton', this.props),
304
+ "data-cid": (0, _uiUtils.combineDataCid)('BaseButton', this.props),
311
305
  children: (0, _jsxRuntime.jsx)("span", {
312
306
  css: styles?.content,
313
307
  children: this.renderChildren()
package/lib/BaseButton/v1/styles.js CHANGED
@@ -4,8 +4,7 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.default = void 0;
7
- var _darken = require("@instructure/ui-color-utils/lib/darken.js");
8
- var _lighten = require("@instructure/ui-color-utils/lib/lighten.js");
7
+ var _uiColorUtils = require("@instructure/ui-color-utils");
9
8
  /*
10
9
  * The MIT License (MIT)
11
10
  *
@@ -137,8 +136,8 @@ const generateStyle = (componentTheme, props, state) => {
137
136
  active: {},
138
137
  hover: {
139
138
  background: `
140
- linear-gradient(to bottom, ${(0, _darken.darken)(componentTheme.aiBackgroundTopGradientColor, 10)} 0%, ${(0, _darken.darken)(componentTheme.aiBackgroundBottomGradientColor, 10)} 100%) padding-box,
141
- linear-gradient(to bottom, ${(0, _darken.darken)(componentTheme.aiBorderTopGradientColor, 10)} 0%, ${(0, _darken.darken)(componentTheme.aiBorderBottomGradientColor, 10)} 100%) border-box`,
139
+ linear-gradient(to bottom, ${(0, _uiColorUtils.darken)(componentTheme.aiBackgroundTopGradientColor, 10)} 0%, ${(0, _uiColorUtils.darken)(componentTheme.aiBackgroundBottomGradientColor, 10)} 100%) padding-box,
140
+ linear-gradient(to bottom, ${(0, _uiColorUtils.darken)(componentTheme.aiBorderTopGradientColor, 10)} 0%, ${(0, _uiColorUtils.darken)(componentTheme.aiBorderBottomGradientColor, 10)} 100%) border-box`,
142
141
  borderStyle: 'solid',
143
142
  borderColor: 'transparent',
144
143
  boxShadow: componentTheme.primaryHoverBoxShadow
@@ -151,7 +150,7 @@ const generateStyle = (componentTheme, props, state) => {
151
150
  active: {},
152
151
  hover: {
153
152
  background: `
154
- linear-gradient(to bottom, ${(0, _lighten.lighten)(componentTheme.aiBackgroundTopGradientColor, 70)} 0%, ${(0, _lighten.lighten)(componentTheme.aiBackgroundBottomGradientColor, 70)} 100%)`
153
+ linear-gradient(to bottom, ${(0, _uiColorUtils.lighten)(componentTheme.aiBackgroundTopGradientColor, 70)} 0%, ${(0, _uiColorUtils.lighten)(componentTheme.aiBackgroundBottomGradientColor, 70)} 100%)`
155
154
  }
156
155
  },
157
156
  primary: withBackground ? {
package/lib/BaseButton/v1/theme.js CHANGED
@@ -4,8 +4,7 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.default = void 0;
7
- var _alpha = require("@instructure/ui-color-utils/lib/alpha.js");
8
- var _darken = require("@instructure/ui-color-utils/lib/darken.js");
7
+ var _uiColorUtils = require("@instructure/ui-color-utils");
9
8
  /*
10
9
  * The MIT License (MIT)
11
10
  *
@@ -49,17 +48,17 @@ const generateComponentTheme = theme => {
49
48
  const themeSpecificStyle = {
50
49
  canvas: {
51
50
  primaryColor: theme['ic-brand-button--primary-text'],
52
- primaryBorderColor: (0, _darken.darken)(theme['ic-brand-button--primary-bgd']),
51
+ primaryBorderColor: (0, _uiColorUtils.darken)(theme['ic-brand-button--primary-bgd']),
53
52
  primaryBackground: theme['ic-brand-button--primary-bgd'],
54
- primaryHoverBackground: (0, _darken.darken)(theme['ic-brand-button--primary-bgd']),
55
- primaryActiveBackground: (0, _darken.darken)(theme['ic-brand-button--primary-bgd']),
53
+ primaryHoverBackground: (0, _uiColorUtils.darken)(theme['ic-brand-button--primary-bgd']),
54
+ primaryActiveBackground: (0, _uiColorUtils.darken)(theme['ic-brand-button--primary-bgd']),
56
55
  primaryActiveBoxShadow: `${activeShadow} ${theme['ic-brand-button--primary-bgd']}`,
57
- primaryGhostColor: (0, _darken.darken)(theme['ic-brand-button--primary-bgd']),
58
- primaryGhostBorderColor: (0, _darken.darken)(theme['ic-brand-button--primary-bgd']),
56
+ primaryGhostColor: (0, _uiColorUtils.darken)(theme['ic-brand-button--primary-bgd']),
57
+ primaryGhostBorderColor: (0, _uiColorUtils.darken)(theme['ic-brand-button--primary-bgd']),
59
58
  primaryGhostBackground: 'transparent',
60
- primaryGhostHoverBackground: (0, _alpha.alpha)((0, _darken.darken)(theme['ic-brand-button--primary-bgd']), 10),
59
+ primaryGhostHoverBackground: (0, _uiColorUtils.alpha)((0, _uiColorUtils.darken)(theme['ic-brand-button--primary-bgd']), 10),
61
60
  primaryGhostActiveBackground: 'transparent',
62
- primaryGhostActiveBoxShadow: `${activeShadow} ${(0, _alpha.alpha)(theme['ic-brand-button--primary-bgd'], 28)}`
61
+ primaryGhostActiveBoxShadow: `${activeShadow} ${(0, _uiColorUtils.alpha)(theme['ic-brand-button--primary-bgd'], 28)}`
63
62
  }
64
63
  };
65
64
  const componentVariables = {
@@ -104,7 +103,7 @@ const generateComponentTheme = theme => {
104
103
  primaryGhostBackground: 'transparent',
105
104
  primaryGhostHoverBackground: colors?.contrasts?.blue1212,
106
105
  primaryGhostActiveBackground: 'transparent',
107
- primaryGhostActiveBoxShadow: `${activeShadow} ${(0, _alpha.alpha)(colors?.contrasts?.blue1212, 28)}`,
106
+ primaryGhostActiveBoxShadow: `${activeShadow} ${(0, _uiColorUtils.alpha)(colors?.contrasts?.blue1212, 28)}`,
108
107
  primaryBoxShadow: 'none',
109
108
  primaryGhostBoxShadow: 'none',
110
109
  primaryHoverBoxShadow: 'none',
@@ -120,7 +119,7 @@ const generateComponentTheme = theme => {
120
119
  secondaryGhostBackground: 'transparent',
121
120
  secondaryGhostHoverBackground: colors?.contrasts?.grey1111,
122
121
  secondaryGhostActiveBackground: 'transparent',
123
- secondaryGhostActiveBoxShadow: `${activeShadow} ${(0, _alpha.alpha)(colors?.contrasts?.grey125125, 28)}`,
122
+ secondaryGhostActiveBoxShadow: `${activeShadow} ${(0, _uiColorUtils.alpha)(colors?.contrasts?.grey125125, 28)}`,
124
123
  secondaryBoxShadow: 'none',
125
124
  secondaryGhostBoxShadow: 'none',
126
125
  secondaryHoverBoxShadow: 'none',
@@ -134,9 +133,9 @@ const generateComponentTheme = theme => {
134
133
  successGhostColor: colors?.contrasts?.green4570,
135
134
  successGhostBorderColor: colors?.contrasts?.green4570,
136
135
  successGhostBackground: 'transparent',
137
- successGhostHoverBackground: (0, _alpha.alpha)(colors?.contrasts?.green4570, 10),
136
+ successGhostHoverBackground: (0, _uiColorUtils.alpha)(colors?.contrasts?.green4570, 10),
138
137
  successGhostActiveBackground: 'transparent',
139
- successGhostActiveBoxShadow: `${activeShadow} ${(0, _alpha.alpha)(colors?.contrasts?.green4570, 28)}`,
138
+ successGhostActiveBoxShadow: `${activeShadow} ${(0, _uiColorUtils.alpha)(colors?.contrasts?.green4570, 28)}`,
140
139
  successBoxShadow: 'none',
141
140
  successGhostBoxShadow: 'none',
142
141
  successHoverBoxShadow: 'none',
@@ -150,9 +149,9 @@ const generateComponentTheme = theme => {
150
149
  dangerGhostColor: colors?.contrasts?.red4570,
151
150
  dangerGhostBorderColor: colors?.contrasts?.red4570,
152
151
  dangerGhostBackground: 'transparent',
153
- dangerGhostHoverBackground: (0, _alpha.alpha)(colors?.contrasts?.red4570, 10),
152
+ dangerGhostHoverBackground: (0, _uiColorUtils.alpha)(colors?.contrasts?.red4570, 10),
154
153
  dangerGhostActiveBackground: 'transparent',
155
- dangerGhostActiveBoxShadow: `${activeShadow} ${(0, _alpha.alpha)(colors?.contrasts?.red4570, 28)}`,
154
+ dangerGhostActiveBoxShadow: `${activeShadow} ${(0, _uiColorUtils.alpha)(colors?.contrasts?.red4570, 28)}`,
156
155
  dangerBoxShadow: 'none',
157
156
  dangerGhostBoxShadow: 'none',
158
157
  dangerHoverBoxShadow: 'none',
@@ -166,9 +165,9 @@ const generateComponentTheme = theme => {
166
165
  primaryInverseGhostColor: colors?.contrasts?.white1010,
167
166
  primaryInverseGhostBorderColor: colors?.contrasts?.white1010,
168
167
  primaryInverseGhostBackground: 'transparent',
169
- primaryInverseGhostHoverBackground: (0, _alpha.alpha)(colors?.contrasts?.white1010, 10),
168
+ primaryInverseGhostHoverBackground: (0, _uiColorUtils.alpha)(colors?.contrasts?.white1010, 10),
170
169
  primaryInverseGhostActiveBackground: 'transparent',
171
- primaryInverseGhostActiveBoxShadow: `${activeShadow} ${(0, _alpha.alpha)(colors?.contrasts?.white1010, 28)}`,
170
+ primaryInverseGhostActiveBoxShadow: `${activeShadow} ${(0, _uiColorUtils.alpha)(colors?.contrasts?.white1010, 28)}`,
172
171
  primaryInverseBoxShadow: 'none',
173
172
  primaryInverseGhostBoxShadow: 'none',
174
173
  primaryInverseHoverBoxShadow: 'none',
package/lib/BaseButton/v2/index.js CHANGED
@@ -7,15 +7,12 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.default = exports.BaseButton = void 0;
8
8
  var _react = require("react");
9
9
  var _keycode = _interopRequireDefault(require("keycode"));
10
- var _getElementType = require("@instructure/ui-react-utils/lib/getElementType.js");
11
- var _getInteraction = require("@instructure/ui-react-utils/lib/getInteraction.js");
12
- var _passthroughProps = require("@instructure/ui-react-utils/lib/passthroughProps.js");
13
- var _isActiveElement = require("@instructure/ui-dom-utils/lib/isActiveElement.js");
14
- var _hasVisibleChildren = require("@instructure/ui-a11y-utils/lib/hasVisibleChildren.js");
15
- var _renderIconWithProps = require("@instructure/ui-icons/lib/IconPropsProvider/renderIconWithProps.js");
10
+ var _uiReactUtils = require("@instructure/ui-react-utils");
11
+ var _uiDomUtils = require("@instructure/ui-dom-utils");
12
+ var _uiA11yUtils = require("@instructure/ui-a11y-utils");
13
+ var _uiIcons = require("@instructure/ui-icons");
16
14
  var _latest = require("@instructure/ui-view/latest");
17
15
  var _uiUtils = require("@instructure/ui-utils");
18
- var _combineDataCid = require("@instructure/ui-utils/lib/combineDataCid.js");
19
16
  var _emotion = require("@instructure/emotion");
20
17
  var _styles = _interopRequireDefault(require("./styles.js"));
21
18
  var _props = require("./props.js");
@@ -44,8 +41,6 @@ var _dec, _class;
44
41
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
45
42
  * SOFTWARE.
46
43
  */
47
- // TODO these have to be imported in separate lines because otherwise `isSafari` will be missing from the babel build
48
- // this bug is very likely caused by `babel-plugin-transform-imports` and can be reverted once it is removed from the codebase
49
44
  const buttonSizeToIconSize = {
50
45
  small: 'sm',
51
46
  medium: 'md',
@@ -107,13 +102,13 @@ let BaseButton = exports.BaseButton = (_dec = (0, _emotion.withStyleNew)(_styles
107
102
  children,
108
103
  renderIcon
109
104
  } = this.props;
110
- return !!(renderIcon && !(0, _hasVisibleChildren.hasVisibleChildren)(children));
105
+ return !!(renderIcon && !(0, _uiA11yUtils.hasVisibleChildren)(children));
111
106
  }
112
107
  get elementType() {
113
- return (0, _getElementType.getElementType)(BaseButton, this.props);
108
+ return (0, _uiReactUtils.getElementType)(BaseButton, this.props);
114
109
  }
115
110
  get interaction() {
116
- return (0, _getInteraction.getInteraction)({
111
+ return (0, _uiReactUtils.getInteraction)({
117
112
  props: this.props
118
113
  });
119
114
  }
@@ -148,7 +143,7 @@ let BaseButton = exports.BaseButton = (_dec = (0, _emotion.withStyleNew)(_styles
148
143
  return color.includes('inverse') ? 'inverse' : 'info';
149
144
  }
150
145
  get focused() {
151
- return (0, _isActiveElement.isActiveElement)(this.ref);
146
+ return (0, _uiDomUtils.isActiveElement)(this.ref);
152
147
  }
153
148
  focus() {
154
149
  this.ref && this.ref.focus();
@@ -229,7 +224,7 @@ let BaseButton = exports.BaseButton = (_dec = (0, _emotion.withStyleNew)(_styles
229
224
  const iconColor = this.isDisabled && color === 'ai-secondary' ? 'inherit' : buttonColorToIconColor[color];
230
225
  const wrappedIcon = (0, _jsxRuntime.jsx)("span", {
231
226
  css: styles?.iconSVG,
232
- children: (0, _renderIconWithProps.renderIconWithProps)(renderIcon, iconSize, iconColor)
227
+ children: (0, _uiIcons.renderIconWithProps)(renderIcon, iconSize, iconColor)
233
228
  });
234
229
  const flexChildren = hasOnlyIconVisible ? (0, _jsxRuntime.jsxs)("span", {
235
230
  css: styles?.iconOnly,
@@ -304,7 +299,7 @@ let BaseButton = exports.BaseButton = (_dec = (0, _emotion.withStyleNew)(_styles
304
299
  tabIndexValue = tabIndex || 0;
305
300
  }
306
301
  return (0, _jsxRuntime.jsx)(_latest.View, {
307
- ...(0, _passthroughProps.passthroughProps)(props),
302
+ ...(0, _uiReactUtils.passthroughProps)(props),
308
303
  as: elementType,
309
304
  focusColor: this.focusColor,
310
305
  position: "relative",
@@ -327,7 +322,7 @@ let BaseButton = exports.BaseButton = (_dec = (0, _emotion.withStyleNew)(_styles
327
322
  disabled: isDisabled || isReadOnly,
328
323
  css: styles?.baseButton,
329
324
  withFocusOutline: withFocusOutline,
330
- "data-cid": (0, _combineDataCid.combineDataCid)('BaseButton', this.props),
325
+ "data-cid": (0, _uiUtils.combineDataCid)('BaseButton', this.props),
331
326
  children: (0, _jsxRuntime.jsx)("span", {
332
327
  css: styles?.content,
333
328
  children: this.renderChildren()
package/lib/Button/v1/index.js CHANGED
@@ -6,8 +6,7 @@ Object.defineProperty(exports, "__esModule", {
6
6
  });
7
7
  exports.default = exports.Button = void 0;
8
8
  var _react = require("react");
9
- var _getInteraction = require("@instructure/ui-react-utils/lib/getInteraction.js");
10
- var _passthroughProps = require("@instructure/ui-react-utils/lib/passthroughProps.js");
9
+ var _uiReactUtils = require("@instructure/ui-react-utils");
11
10
  var _emotion = require("@instructure/emotion");
12
11
  var _theme = _interopRequireDefault(require("./theme.js"));
13
12
  var _index = require("../../BaseButton/v1/index.js");
@@ -97,12 +96,12 @@ let Button = exports.Button = (_dec = (0, _emotion.withStyle)(null, _theme.defau
97
96
  renderIcon,
98
97
  ...props
99
98
  } = this.props;
100
- const interaction = (0, _getInteraction.getInteraction)({
99
+ const interaction = (0, _uiReactUtils.getInteraction)({
101
100
  props
102
101
  });
103
102
  const themeOverride = this.props.themeOverride;
104
103
  const buttonProps = {
105
- ...(0, _passthroughProps.passthroughProps)(props),
104
+ ...(0, _uiReactUtils.passthroughProps)(props),
106
105
  type,
107
106
  size,
108
107
  elementRef: this.handleElementRef,
package/lib/Button/v2/index.js CHANGED
@@ -5,8 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = exports.Button = void 0;
7
7
  var _react = require("react");
8
- var _getInteraction = require("@instructure/ui-react-utils/lib/getInteraction.js");
9
- var _passthroughProps = require("@instructure/ui-react-utils/lib/passthroughProps.js");
8
+ var _uiReactUtils = require("@instructure/ui-react-utils");
10
9
  var _emotion = require("@instructure/emotion");
11
10
  var _index = require("../../BaseButton/v2/index.js");
12
11
  var _props = require("./props.js");
@@ -97,12 +96,12 @@ let Button = exports.Button = (_dec = (0, _emotion.withStyleNew)(null, 'BaseButt
97
96
  renderIcon,
98
97
  ...props
99
98
  } = this.props;
100
- const interaction = (0, _getInteraction.getInteraction)({
99
+ const interaction = (0, _uiReactUtils.getInteraction)({
101
100
  props
102
101
  });
103
102
  const themeOverride = this.props.themeOverride;
104
103
  const buttonProps = {
105
- ...(0, _passthroughProps.passthroughProps)(props),
104
+ ...(0, _uiReactUtils.passthroughProps)(props),
106
105
  type,
107
106
  size,
108
107
  elementRef: this.handleElementRef,
package/lib/CloseButton/v1/index.js CHANGED
@@ -6,10 +6,9 @@ Object.defineProperty(exports, "__esModule", {
6
6
  });
7
7
  exports.default = exports.CloseButton = void 0;
8
8
  var _react = require("react");
9
- var _IconXSolid = require("@instructure/ui-icons/lib/generated/IconXSolid.js");
10
- var _ScreenReaderContent = require("@instructure/ui-a11y-content/lib/ScreenReaderContent");
11
- var _getInteraction = require("@instructure/ui-react-utils/lib/getInteraction.js");
12
- var _passthroughProps = require("@instructure/ui-react-utils/lib/passthroughProps.js");
9
+ var _uiIcons = require("@instructure/ui-icons");
10
+ var _uiA11yContent = require("@instructure/ui-a11y-content");
11
+ var _uiReactUtils = require("@instructure/ui-react-utils");
13
12
  var _emotion = require("@instructure/emotion");
14
13
  var _styles = _interopRequireDefault(require("./styles.js"));
15
14
  var _theme = _interopRequireDefault(require("./theme.js"));
@@ -76,7 +75,7 @@ let CloseButton = exports.CloseButton = (_dec = (0, _emotion.withStyle)(_styles.
76
75
  this.props.makeStyles?.();
77
76
  }
78
77
  get interaction() {
79
- return (0, _getInteraction.getInteraction)({
78
+ return (0, _uiReactUtils.getInteraction)({
80
79
  props: this.props
81
80
  });
82
81
  }
@@ -104,13 +103,13 @@ let CloseButton = exports.CloseButton = (_dec = (0, _emotion.withStyle)(_styles.
104
103
  ...props
105
104
  } = this.props;
106
105
  return (0, _jsxRuntime.jsx)("span", {
107
- ...(0, _passthroughProps.passthroughProps)(props),
106
+ ...(0, _uiReactUtils.passthroughProps)(props),
108
107
  css: styles?.closeButton,
109
108
  ref: el => {
110
109
  this.ref = el;
111
110
  },
112
111
  children: (0, _jsxRuntime.jsx)(_index.BaseButton, {
113
- renderIcon: _IconXSolid.IconXSolid,
112
+ renderIcon: _uiIcons.IconXSolid,
114
113
  elementRef: this.handleRef,
115
114
  interaction: this.interaction,
116
115
  type: type,
@@ -127,7 +126,7 @@ let CloseButton = exports.CloseButton = (_dec = (0, _emotion.withStyle)(_styles.
127
126
  cursor: cursor,
128
127
  tabIndex: tabIndex,
129
128
  "data-cid": "CloseButton",
130
- children: (0, _jsxRuntime.jsx)(_ScreenReaderContent.ScreenReaderContent, {
129
+ children: (0, _jsxRuntime.jsx)(_uiA11yContent.ScreenReaderContent, {
131
130
  children: screenReaderLabel
132
131
  })
133
132
  })
package/lib/CloseButton/v2/index.js CHANGED
@@ -7,9 +7,8 @@ Object.defineProperty(exports, "__esModule", {
7
7
  exports.default = exports.CloseButton = void 0;
8
8
  var _react = require("react");
9
9
  var _uiIcons = require("@instructure/ui-icons");
10
- var _ScreenReaderContent = require("@instructure/ui-a11y-content/lib/ScreenReaderContent");
11
- var _getInteraction = require("@instructure/ui-react-utils/lib/getInteraction.js");
12
- var _passthroughProps = require("@instructure/ui-react-utils/lib/passthroughProps.js");
10
+ var _uiA11yContent = require("@instructure/ui-a11y-content");
11
+ var _uiReactUtils = require("@instructure/ui-react-utils");
13
12
  var _emotion = require("@instructure/emotion");
14
13
  var _styles = _interopRequireDefault(require("./styles.js"));
15
14
  var _index = require("../../BaseButton/v2/index.js");
@@ -77,7 +76,7 @@ let CloseButton = exports.CloseButton = (_dec = (0, _emotion.withStyleNew)(_styl
77
76
  this.props.makeStyles?.();
78
77
  }
79
78
  get interaction() {
80
- return (0, _getInteraction.getInteraction)({
79
+ return (0, _uiReactUtils.getInteraction)({
81
80
  props: this.props
82
81
  });
83
82
  }
@@ -106,7 +105,7 @@ let CloseButton = exports.CloseButton = (_dec = (0, _emotion.withStyleNew)(_styl
106
105
  } = this.props;
107
106
  const themeOverride = this.props.themeOverride;
108
107
  return (0, _jsxRuntime.jsx)("span", {
109
- ...(0, _passthroughProps.passthroughProps)(props),
108
+ ...(0, _uiReactUtils.passthroughProps)(props),
110
109
  css: styles?.closeButton,
111
110
  ref: el => {
112
111
  this.ref = el;
@@ -130,7 +129,7 @@ let CloseButton = exports.CloseButton = (_dec = (0, _emotion.withStyleNew)(_styl
130
129
  tabIndex: tabIndex,
131
130
  themeOverride: themeOverride,
132
131
  "data-cid": "CloseButton",
133
- children: (0, _jsxRuntime.jsx)(_ScreenReaderContent.ScreenReaderContent, {
132
+ children: (0, _jsxRuntime.jsx)(_uiA11yContent.ScreenReaderContent, {
134
133
  children: screenReaderLabel
135
134
  })
136
135
  })
package/lib/CondensedButton/v1/index.js CHANGED
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
6
6
  });
7
7
  exports.default = exports.CondensedButton = void 0;
8
8
  var _react = require("react");
9
- var _passthroughProps = require("@instructure/ui-react-utils/lib/passthroughProps.js");
9
+ var _uiReactUtils = require("@instructure/ui-react-utils");
10
10
  var _emotion = require("@instructure/emotion");
11
11
  var _theme = _interopRequireDefault(require("./theme.js"));
12
12
  var _index = require("../../BaseButton/v1/index.js");
@@ -92,7 +92,7 @@ let CondensedButton = exports.CondensedButton = (_dec = (0, _emotion.withStyle)(
92
92
  } = this.props;
93
93
  const themeOverride = this.props.themeOverride;
94
94
  return (0, _jsxRuntime.jsx)(_index.BaseButton, {
95
- ...(0, _passthroughProps.passthroughProps)(props),
95
+ ...(0, _uiReactUtils.passthroughProps)(props),
96
96
  isCondensed: true,
97
97
  display: display,
98
98
  withBackground: false,
package/lib/CondensedButton/v2/index.js CHANGED
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = exports.CondensedButton = void 0;
7
7
  var _react = require("react");
8
- var _passthroughProps = require("@instructure/ui-react-utils/lib/passthroughProps.js");
8
+ var _uiReactUtils = require("@instructure/ui-react-utils");
9
9
  var _emotion = require("@instructure/emotion");
10
10
  var _index = require("../../BaseButton/v2/index.js");
11
11
  var _props = require("./props.js");
@@ -92,7 +92,7 @@ let CondensedButton = exports.CondensedButton = (_dec = (0, _emotion.withStyleNe
92
92
  } = this.props;
93
93
  const themeOverride = this.props.themeOverride;
94
94
  return (0, _jsxRuntime.jsx)(_index.BaseButton, {
95
- ...(0, _passthroughProps.passthroughProps)(props),
95
+ ...(0, _uiReactUtils.passthroughProps)(props),
96
96
  isCondensed: true,
97
97
  display: display,
98
98
  withBackground: false,
package/lib/IconButton/v1/index.js CHANGED
@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
6
6
  });
7
7
  exports.default = exports.IconButton = void 0;
8
8
  var _react = require("react");
9
- var _passthroughProps = require("@instructure/ui-react-utils/lib/passthroughProps.js");
10
- var _ScreenReaderContent = require("@instructure/ui-a11y-content/lib/ScreenReaderContent");
11
- var _combineDataCid = require("@instructure/ui-utils/lib/combineDataCid.js");
9
+ var _uiReactUtils = require("@instructure/ui-react-utils");
10
+ var _uiA11yContent = require("@instructure/ui-a11y-content");
11
+ var _uiUtils = require("@instructure/ui-utils");
12
12
  var _emotion = require("@instructure/emotion");
13
13
  var _theme = _interopRequireDefault(require("./theme.js"));
14
14
  var _index = require("../../BaseButton/v1/index.js");
@@ -100,7 +100,7 @@ let IconButton = exports.IconButton = (_dec = (0, _emotion.withStyle)(null, _the
100
100
  } = this.props;
101
101
  const themeOverride = this.props.themeOverride;
102
102
  return (0, _jsxRuntime.jsx)(_index.BaseButton, {
103
- ...(0, _passthroughProps.passthroughProps)(props),
103
+ ...(0, _uiReactUtils.passthroughProps)(props),
104
104
  type: type,
105
105
  size: size,
106
106
  elementRef: this.handleRef,
@@ -119,8 +119,8 @@ let IconButton = exports.IconButton = (_dec = (0, _emotion.withStyle)(null, _the
119
119
  ref: component => {
120
120
  this._baseButton = component;
121
121
  },
122
- "data-cid": (0, _combineDataCid.combineDataCid)('IconButton', this.props),
123
- children: (0, _jsxRuntime.jsx)(_ScreenReaderContent.ScreenReaderContent, {
122
+ "data-cid": (0, _uiUtils.combineDataCid)('IconButton', this.props),
123
+ children: (0, _jsxRuntime.jsx)(_uiA11yContent.ScreenReaderContent, {
124
124
  children: screenReaderLabel
125
125
  })
126
126
  });
package/lib/IconButton/v2/index.js CHANGED
@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = exports.IconButton = void 0;
7
7
  var _react = require("react");
8
- var _passthroughProps = require("@instructure/ui-react-utils/lib/passthroughProps.js");
9
- var _ScreenReaderContent = require("@instructure/ui-a11y-content/lib/ScreenReaderContent");
10
- var _combineDataCid = require("@instructure/ui-utils/lib/combineDataCid.js");
8
+ var _uiReactUtils = require("@instructure/ui-react-utils");
9
+ var _uiA11yContent = require("@instructure/ui-a11y-content");
10
+ var _uiUtils = require("@instructure/ui-utils");
11
11
  var _emotion = require("@instructure/emotion");
12
12
  var _index = require("../../BaseButton/v2/index.js");
13
13
  var _props = require("./props.js");
@@ -100,7 +100,7 @@ let IconButton = exports.IconButton = (_dec = (0, _emotion.withStyleNew)(null, '
100
100
  } = this.props;
101
101
  const themeOverride = this.props.themeOverride;
102
102
  return (0, _jsxRuntime.jsx)(_index.BaseButton, {
103
- ...(0, _passthroughProps.passthroughProps)(props),
103
+ ...(0, _uiReactUtils.passthroughProps)(props),
104
104
  type: type,
105
105
  size: size,
106
106
  elementRef: this.handleRef,
@@ -119,8 +119,8 @@ let IconButton = exports.IconButton = (_dec = (0, _emotion.withStyleNew)(null, '
119
119
  ref: component => {
120
120
  this._baseButton = component;
121
121
  },
122
- "data-cid": (0, _combineDataCid.combineDataCid)('IconButton', this.props),
123
- children: (0, _jsxRuntime.jsx)(_ScreenReaderContent.ScreenReaderContent, {
122
+ "data-cid": (0, _uiUtils.combineDataCid)('IconButton', this.props),
123
+ children: (0, _jsxRuntime.jsx)(_uiA11yContent.ScreenReaderContent, {
124
124
  children: screenReaderLabel
125
125
  })
126
126
  });
package/lib/ToggleButton/v1/index.js CHANGED
@@ -5,8 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = exports.ToggleButton = void 0;
7
7
  var _react = require("react");
8
- var _callRenderProp = require("@instructure/ui-react-utils/lib/callRenderProp.js");
9
- var _passthroughProps = require("@instructure/ui-react-utils/lib/passthroughProps.js");
8
+ var _uiReactUtils = require("@instructure/ui-react-utils");
10
9
  var _v11_ = require("@instructure/ui-tooltip/v11_6");
11
10
  var _index = require("../../IconButton/v1/index.js");
12
11
  var _props = require("./props.js");
@@ -108,7 +107,7 @@ class ToggleButton extends _react.Component {
108
107
  mountNode: mountNode,
109
108
  elementRef: el => this.ref = el,
110
109
  children: (0, _jsxRuntime.jsx)(_index.IconButton, {
111
- ...(0, _passthroughProps.passthroughProps)(props),
110
+ ...(0, _uiReactUtils.passthroughProps)(props),
112
111
  screenReaderLabel: screenReaderLabel,
113
112
  withBackground: false,
114
113
  withBorder: false,
@@ -120,7 +119,7 @@ class ToggleButton extends _react.Component {
120
119
  interaction: interaction,
121
120
  "aria-pressed": status === 'pressed',
122
121
  "data-cid": "ToggleButton",
123
- children: (0, _callRenderProp.callRenderProp)(renderIcon)
122
+ children: (0, _uiReactUtils.callRenderProp)(renderIcon)
124
123
  })
125
124
  });
126
125
  }
package/lib/ToggleButton/v2/index.js CHANGED
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = exports.ToggleButton = void 0;
7
7
  var _react = require("react");
8
- var _passthroughProps = require("@instructure/ui-react-utils/lib/passthroughProps.js");
8
+ var _uiReactUtils = require("@instructure/ui-react-utils");
9
9
  var _latest = require("@instructure/ui-tooltip/latest");
10
10
  var _index = require("../../IconButton/v2/index.js");
11
11
  var _props = require("./props.js");
@@ -108,7 +108,7 @@ class ToggleButton extends _react.Component {
108
108
  mountNode: mountNode,
109
109
  elementRef: el => this.ref = el,
110
110
  children: (0, _jsxRuntime.jsx)(_index.IconButton, {
111
- ...(0, _passthroughProps.passthroughProps)(props),
111
+ ...(0, _uiReactUtils.passthroughProps)(props),
112
112
  screenReaderLabel: screenReaderLabel,
113
113
  withBackground: false,
114
114
  withBorder: false,