Skip to content

Commit e0bb43d

Browse files
authored
Merge branch 'master' into Mil4n0r/fix_toast_keyboard_interaction
2 parents 723c6fc + 51b0da8 commit e0bb43d

File tree

12 files changed

+690
-1885
lines changed

12 files changed

+690
-1885
lines changed

apps/website/next.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,5 @@ module.exports = {
2828
"@cloudscape-design/components",
2929
"@cloudscape-design/component-toolkit",
3030
"@cloudscape-design/theming-runtime",
31-
"@dxc-technology/halstack-react",
3231
],
3332
};

apps/website/screens/components/text-input/code/TextInputCodePage.tsx

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import action from "./examples/action";
99
import functionSuggestions from "./examples/functionSuggestions";
1010
import errorHandling from "./examples/errorHandling";
1111
import Code, { TableCode, ExtendedTableCode } from "@/common/Code";
12+
import StatusBadge from "@/common/StatusBadge";
1213

1314
const actionTypeString = `{
1415
icon?: string | (React.ReactNode
@@ -32,13 +33,32 @@ const sections = [
3233
</thead>
3334
<tbody>
3435
<tr>
35-
<td>action</td>
3636
<td>
37-
<ExtendedTableCode>{actionTypeString}</ExtendedTableCode>
37+
<DxcFlex direction="column" gap="var(--spacing-gap-xs)" alignItems="baseline">
38+
<StatusBadge status="new" />
39+
alignment
40+
</DxcFlex>
41+
</td>
42+
<td>
43+
<TableCode>'left' | 'right'</TableCode>
44+
</td>
45+
<td>
46+
Sets <Code>text-align</Code> CSS property inside the input. See{" "}
47+
<DxcLink newWindow href="https://developer.mozilla.org/en-US/docs/Web/CSS/text-align">
48+
MDN
49+
</DxcLink>{" "}
50+
for further information.
3851
</td>
3952
<td>
40-
Action to be displayed on the right side of the input.
53+
<TableCode>'left'</TableCode>
54+
</td>
55+
</tr>
56+
<tr>
57+
<td>action</td>
58+
<td>
59+
<ExtendedTableCode>{actionTypeString}</ExtendedTableCode>
4160
</td>
61+
<td>Action to be displayed on the right side of the input.</td>
4262
<td>-</td>
4363
</tr>
4464
<tr>

apps/website/screens/components/text-input/overview/TextInputOverviewPage.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,11 @@ const sections = [
254254
<strong>Support various states consistently:</strong> reflect focus, disabled, error, and read-only states
255255
with distinct, accessible visual cues.
256256
</DxcBulletedList.Item>
257+
<DxcBulletedList.Item>
258+
<strong>Apply appropiate alignment:</strong> It is recommended to use left alignment in general, except
259+
when there is a specific need for right alignment, such as in currency inputs or numeric fields, generally
260+
using a suffix.
261+
</DxcBulletedList.Item>
257262
</DxcBulletedList>
258263
),
259264
},

package-lock.json

Lines changed: 268 additions & 1826 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/lib/babel.config.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,14 @@ module.exports = {
1313
"@babel/plugin-proposal-optional-chaining",
1414
"@babel/plugin-proposal-nullish-coalescing-operator",
1515
"@babel/plugin-transform-runtime",
16-
["@emotion", { sourceMap: true, autoLabel: "dev-only", labelFormat: "[local]" }],
16+
[
17+
"@emotion",
18+
{
19+
sourceMap: true,
20+
autoLabel: "dev-only",
21+
labelFormat: "[local]",
22+
},
23+
],
1724
],
18-
ignore: ["**/*.stories.jsx", "**/*.stories.tsx", "**/*.d.ts"],
25+
ignore: ["**/*.stories.*", "**/*.d.ts"],
1926
};

packages/lib/package.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,8 @@
99
"module": "./dist/index.mjs",
1010
"types": "./dist/index.d.ts",
1111
"exports": {
12-
".": {
13-
"import": "./dist/index.mjs",
14-
"require": "./dist/index.js"
15-
}
12+
"types": "./src/index.ts",
13+
"default": "./dist/index.js"
1614
},
1715
"files": [
1816
"dist"
@@ -31,20 +29,22 @@
3129
"test:watch": "jest --env=jsdom --config=./jest.config.js --watch"
3230
},
3331
"peerDependencies": {
32+
"@emotion/react": "^11.14.0",
33+
"@emotion/styled": "^11.14.0",
3434
"react": "^18.3.1",
3535
"react-data-grid": "7.0.0-beta.44",
36-
"react-dom": "^18.3.1",
37-
"@emotion/react": "^11.14.0",
38-
"@emotion/styled": "^11.14.0"
36+
"react-dom": "^18.3.1"
3937
},
4038
"dependencies": {
39+
"@babel/runtime": "^7.28.2",
4140
"@radix-ui/react-popover": "^1.1.0",
4241
"@radix-ui/react-tooltip": "^1.1.0",
4342
"color": "^4.2.3",
4443
"dayjs": "^1.11.11",
4544
"slugify": "^1.6.6"
4645
},
4746
"devDependencies": {
47+
"@babel/core": "^7.28.0",
4848
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
4949
"@babel/plugin-proposal-optional-chaining": "^7.13.8",
5050
"@babel/plugin-transform-runtime": "^7.16.8",
@@ -54,7 +54,7 @@
5454
"@chromatic-com/storybook": "^1.5.0",
5555
"@dxc-technology/eslint-config": "*",
5656
"@dxc-technology/typescript-config": "*",
57-
"@emotion/babel-plugin": "^11.9.2",
57+
"@emotion/babel-plugin": "^11.13.5",
5858
"@emotion/react": "^11.14.0",
5959
"@emotion/styled": "^11.14.0",
6060
"@storybook/addon-a11y": "^8.1.10",
@@ -78,6 +78,7 @@
7878
"@vitejs/plugin-react": "4.6.0",
7979
"axe-playwright": "^2.1.0",
8080
"chromatic": "^11.5.4",
81+
"esbuild-plugin-babel": "^0.2.3",
8182
"eslint": "^8.57.0",
8283
"eslint-plugin-storybook": "^0.8.0",
8384
"identity-obj-proxy": "^3.0.0",

0 commit comments

Comments
 (0)