@instructure/ui-number-input 10.5.0 → 10.5.1-snapshot-1

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [10.5.1-snapshot-1](https://github.com/instructure/instructure-ui/compare/v10.5.0...v10.5.1-snapshot-1) (2024-11-11)
+
+
+### Bug Fixes
+
+* **many:** fix regression where form elements without label got misaligned ([139f7f1](https://github.com/instructure/instructure-ui/commit/139f7f130cd7e8372af869a13cfd50cd6a97fd85))
+
+
+
+
+
 # [10.5.0](https://github.com/instructure/instructure-ui/compare/v10.4.1...v10.5.0) (2024-11-07)
 
 

package/es/NumberInput/index.js

@@ -30,6 +30,7 @@ import { FormField } from '@instructure/ui-form-field';
 import { IconArrowOpenDownLine, IconArrowOpenUpLine } from '@instructure/ui-icons';
 import { testable } from '@instructure/ui-testable';
 import { omitProps, pickProps, callRenderProp, getInteraction, withDeterministicId } from '@instructure/ui-react-utils';
+import { hasVisibleChildren } from '@instructure/ui-a11y-utils';
 import { withStyle, jsx } from '@instructure/emotion';
 import generateStyle from './styles';
 import generateComponentTheme from './theme';
@@ -179,10 +180,12 @@ let NumberInput = (_dec = withDeterministicId(), _dec2 = withStyle(generateStyle
       width = _this$props4.width,
       styles = _this$props4.styles;
     const interaction = this.interaction;
+    const rawLabel = callRenderProp(renderLabel);
+    const label = hasVisibleChildren(rawLabel) ? jsx(React.Fragment, null, rawLabel, isRequired && jsx("span", {
+      css: this.invalid ? styles === null || styles === void 0 ? void 0 : styles.requiredInvalid : {}
+    }, " *")) : rawLabel;
     return jsx(FormField, Object.assign({}, pickProps(this.props, FormField.allowedProps), {
-      label: jsx(React.Fragment, null, callRenderProp(renderLabel), isRequired && jsx("span", {
-        css: this.invalid ? styles === null || styles === void 0 ? void 0 : styles.requiredInvalid : {}
-      }, " *")),
+      label: label,
       inline: display === 'inline-block',
       id: this.id,
       elementRef: this.handleRef

package/lib/NumberInput/index.js

@@ -17,6 +17,7 @@ var _pickProps = require("@instructure/ui-react-utils/lib/pickProps.js");
 var _callRenderProp = require("@instructure/ui-react-utils/lib/callRenderProp.js");
 var _getInteraction = require("@instructure/ui-react-utils/lib/getInteraction.js");
 var _withDeterministicId = require("@instructure/ui-react-utils/lib/DeterministicIdContext/withDeterministicId.js");
+var _hasVisibleChildren = require("@instructure/ui-a11y-utils/lib/hasVisibleChildren.js");
 var _emotion = require("@instructure/emotion");
 var _styles = _interopRequireDefault(require("./styles"));
 var _theme = _interopRequireDefault(require("./theme"));
@@ -191,10 +192,12 @@ let NumberInput = exports.NumberInput = (_dec = (0, _withDeterministicId.withDet
       width = _this$props4.width,
       styles = _this$props4.styles;
     const interaction = this.interaction;
+    const rawLabel = (0, _callRenderProp.callRenderProp)(renderLabel);
+    const label = (0, _hasVisibleChildren.hasVisibleChildren)(rawLabel) ? (0, _emotion.jsx)(_react.default.Fragment, null, rawLabel, isRequired && (0, _emotion.jsx)("span", {
+      css: this.invalid ? styles === null || styles === void 0 ? void 0 : styles.requiredInvalid : {}
+    }, " *")) : rawLabel;
     return (0, _emotion.jsx)(_FormField.FormField, Object.assign({}, (0, _pickProps.pickProps)(this.props, _FormField.FormField.allowedProps), {
-      label: (0, _emotion.jsx)(_react.default.Fragment, null, (0, _callRenderProp.callRenderProp)(renderLabel), isRequired && (0, _emotion.jsx)("span", {
-        css: this.invalid ? styles === null || styles === void 0 ? void 0 : styles.requiredInvalid : {}
-      }, " *")),
+      label: label,
       inline: display === 'inline-block',
       id: this.id,
       elementRef: this.handleRef

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/ui-number-input",
-  "version": "10.5.0",
+  "version": "10.5.1-snapshot-1",
   "description": "A UI component library made by Instructure Inc.",
   "author": "Instructure, Inc. Engineering and Product Design",
   "homepage": "https://instructure.github.io/instructure-ui/",
@@ -23,11 +23,11 @@
     "ts:check": "tsc -p tsconfig.build.json --noEmit --emitDeclarationOnly false"
   },
   "devDependencies": {
-    "@instructure/ui-axe-check": "10.5.0",
-    "@instructure/ui-babel-preset": "10.5.0",
-    "@instructure/ui-scripts": "10.5.0",
-    "@instructure/ui-test-utils": "10.5.0",
-    "@instructure/ui-themes": "10.5.0",
+    "@instructure/ui-axe-check": "10.5.1-snapshot-1",
+    "@instructure/ui-babel-preset": "10.5.1-snapshot-1",
+    "@instructure/ui-scripts": "10.5.1-snapshot-1",
+    "@instructure/ui-test-utils": "10.5.1-snapshot-1",
+    "@instructure/ui-themes": "10.5.1-snapshot-1",
     "@testing-library/jest-dom": "^6.4.6",
     "@testing-library/react": "^16.0.1",
     "@testing-library/user-event": "^14.5.2",
@@ -35,14 +35,14 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.25.6",
-    "@instructure/emotion": "10.5.0",
-    "@instructure/shared-types": "10.5.0",
-    "@instructure/ui-form-field": "10.5.0",
-    "@instructure/ui-icons": "10.5.0",
-    "@instructure/ui-react-utils": "10.5.0",
-    "@instructure/ui-testable": "10.5.0",
-    "@instructure/ui-utils": "10.5.0",
-    "@instructure/uid": "10.5.0",
+    "@instructure/emotion": "10.5.1-snapshot-1",
+    "@instructure/shared-types": "10.5.1-snapshot-1",
+    "@instructure/ui-form-field": "10.5.1-snapshot-1",
+    "@instructure/ui-icons": "10.5.1-snapshot-1",
+    "@instructure/ui-react-utils": "10.5.1-snapshot-1",
+    "@instructure/ui-testable": "10.5.1-snapshot-1",
+    "@instructure/ui-utils": "10.5.1-snapshot-1",
+    "@instructure/uid": "10.5.1-snapshot-1",
     "keycode": "^2",
     "prop-types": "^15.8.1"
   },

package/src/NumberInput/index.tsx

@@ -39,6 +39,7 @@ import {
   getInteraction,
   withDeterministicId
 } from '@instructure/ui-react-utils'
+import { hasVisibleChildren } from '@instructure/ui-a11y-utils'
 
 import { withStyle, jsx } from '@instructure/emotion'
 
@@ -101,7 +102,9 @@ class NumberInput extends Component<NumberInputProps, NumberInputState> {
   get invalid() {
     return (
       !!this.props.messages &&
-      this.props.messages.some((message) => message.type === 'error' || message.type === 'newError')
+      this.props.messages.some(
+        (message) => message.type === 'error' || message.type === 'newError'
+      )
     )
   }
 
@@ -238,17 +241,22 @@ class NumberInput extends Component<NumberInputProps, NumberInputState> {
 
     const { interaction } = this
 
+    const rawLabel = callRenderProp(renderLabel)
+    const label = hasVisibleChildren(rawLabel) ? (
+      <React.Fragment>
+        {rawLabel}
+        {isRequired && (
+          <span css={this.invalid ? styles?.requiredInvalid : {}}> *</span>
+        )}
+      </React.Fragment>
+    ) : (
+      rawLabel
+    )
+
     return (
       <FormField
         {...pickProps(this.props, FormField.allowedProps)}
-        label={
-          <React.Fragment>
-            {callRenderProp(renderLabel)}
-            {isRequired && (
-              <span css={this.invalid ? styles?.requiredInvalid : {}}> *</span>
-            )}
-          </React.Fragment>
-        }
+        label={label}
         inline={display === 'inline-block'}
         id={this.id}
         elementRef={this.handleRef}

package/src/NumberInput/props.ts

@@ -64,7 +64,7 @@ type NumberInputOwnProps = {
   /**
    * Array of objects with shape: `{
    *   text: ReactNode,
-   *   type: One of: ['error', 'hint', 'success', 'screenreader-only']
+   *   type: One of: ['newError', 'error', 'hint', 'success', 'screenreader-only']
    * }`
    */
   messages?: FormMessage[]