Merge branch 'master' into feat/myGroupsPickerPresentationApi

2024-07-31 13:56:47 +02:00
parent 1552c334ba 23af0b6d0b
commit 154c5b3fc6
559 changed files with 15594 additions and 2484 deletions
@@ -1,5 +1,27 @@
 # @backstage/plugin-scaffolder

+## 1.23.1-next.1
+
+### Patch Changes
+
+- 896a22d: Fix helper text margin for scaffolder EntityNamePicker and EntityTagsPicker when using outlined text field
+- Updated dependencies
+  - @backstage/plugin-catalog-react@1.12.3-next.1
+  - @backstage/frontend-plugin-api@0.6.8-next.1
+  - @backstage/core-compat-api@0.2.8-next.1
+  - @backstage/plugin-scaffolder-react@1.11.0-next.1
+  - @backstage/integration@1.14.0-next.0
+  - @backstage/plugin-catalog-common@1.0.26-next.0
+  - @backstage/plugin-permission-react@0.4.25-next.0
+  - @backstage/plugin-scaffolder-common@1.5.5-next.0
+  - @backstage/catalog-client@1.6.5
+  - @backstage/catalog-model@1.5.0
+  - @backstage/core-components@0.14.10-next.0
+  - @backstage/core-plugin-api@1.9.3
+  - @backstage/errors@1.2.4
+  - @backstage/integration-react@1.1.30-next.0
+  - @backstage/types@1.1.1
+
 ## 1.23.1-next.0

 ### Patch Changes
@@ -1,6 +1,6 @@
 {
  "name": "@backstage/plugin-scaffolder",
-  "version": "1.23.1-next.0",
+  "version": "1.23.1-next.1",
  "description": "The Backstage plugin that helps you create new things",
  "backstage": {
    "role": "frontend-plugin",
@@ -46,6 +46,7 @@ export const EntityNamePicker = (props: EntityNamePickerProps) => {
      margin="normal"
      error={rawErrors?.length > 0 && !formData}
      inputProps={{ autoFocus }}
+      FormHelperTextProps={{ margin: 'dense', style: { marginLeft: 0 } }}
    />
  );
 };
@@ -116,6 +116,7 @@ export const EntityTagsPicker = (props: EntityTagsPickerProps) => {
              helperText ??
              "Add any relevant tags, hit 'Enter' to add new tags. Valid format: [a-z0-9+#] separated by [-], at most 63 characters"
            }
+            FormHelperTextProps={{ margin: 'dense', style: { marginLeft: 0 } }}
          />
        )}
      />