Skip to content

Commit

Permalink
Merge branch 'main' into pin-babel-plugin-version
Browse files Browse the repository at this point in the history
  • Loading branch information
reesscot committed Dec 22, 2022
2 parents a234f8f + 0da7ad7 commit 9acea57
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 68 deletions.
2 changes: 1 addition & 1 deletion canary/apps/react/cra-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@aws-amplify/ui-react": "^2.2.1",
"@aws-amplify/ui-react": "latest",
"@testing-library/jest-dom": "^5.16.1",
"@testing-library/react": "^12.1.2",
"@testing-library/user-event": "^13.5.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ export interface GetFieldControlsProps {
export const GetFieldControls = ({ fields }: GetFieldControlsProps) => {
return (
<Flex direction="column">
{fields.map(([value, setter, name, type = 'text']) =>
{fields.map(([value, setter, name, type = 'text'], idx) =>
type === 'checkbox' ? (
<CheckboxField
key={`${name}-${idx}`}
name={name}
value={value as string}
checked={Boolean(value)}
Expand All @@ -32,11 +33,12 @@ export const GetFieldControls = ({ fields }: GetFieldControlsProps) => {
/>
) : (
<TextField
key={`${name}-${idx}`}
name={name}
placeholder={`Set ${name}`}
value={value}
label={name}
onChange={(event: any) => {
onChange={(event: React.BaseSyntheticEvent) => {
setter(event.target.value);
}}
/>
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"vue-example": "yarn workspace vue-example",
"e2e": "yarn workspace e2e",
"environments": "yarn workspace environments",
"build:icons": "yarn react build:icons",
"test": "yarn ui test && yarn react-core test && yarn react test && yarn react-native test && yarn e2e test",
"prepare": "husky install",
"version:next": "yarn changeset version --snapshot next-$(git rev-parse --short=7 HEAD) && yarn generateVersions && yarn angular build",
Expand Down
3 changes: 0 additions & 3 deletions packages/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@
"build:catalog": "yarn ts scripts/generatePrimitiveCatalog.ts",
"dev": "tsup --watch",
"dev:build": "tsup",
"update:icons": "node scripts/updateIcons.js",
"build:icons": "yarn run clean:icons && node scripts/generateIcons.js",
"clean": "rimraf dist node_modules",
"clean:icons": "rimraf ./src/primitives/Icon/icons",
"lint": "tsc --noEmit --project tsconfig.dev.json && yarn eslint ./src --ext .js,.ts,.tsx",
"test": "yarn test:unit",
"test:watch": "yarn test:unit:watch",
Expand Down
61 changes: 0 additions & 61 deletions packages/react/scripts/generateIcons.js

This file was deleted.

0 comments on commit 9acea57

Please sign in to comment.