Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
KenyaMasuko committed Feb 11, 2024
2 parents 0dc27e6 + eadc2a4 commit b35f1df
Show file tree
Hide file tree
Showing 5 changed files with 1,237 additions and 1,154 deletions.
2 changes: 1 addition & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
"snapshot": {
"useCalculatedVersion": true
},
"ignore": ["create-react-app", "nextjs-app", "nextjs-pages"]
"ignore": ["create-react-app", "nextjs-app", "nextjs-pages", "vite-react"]
}
4 changes: 2 additions & 2 deletions examples/vite/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "vite",
"name": "vite-react",
"version": "0.1.1",
"private": true,
"type": "module",
Expand Down Expand Up @@ -36,6 +36,6 @@
"eslint-config-prettier": "^9.1.0",
"prettier": "^3.1.1",
"typescript": "^5.3.3",
"vite": "^5.0.12"
"vite": "^5.1.1"
}
}
66 changes: 33 additions & 33 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,40 +65,40 @@
"@changesets/get-release-plan": "^4.0.0",
"@changesets/types": "^6.0.0",
"@clack/prompts": "^0.7.0",
"@commitlint/cli": "^18.4.4",
"@commitlint/config-conventional": "^18.4.4",
"@commitlint/cli": "^18.6.0",
"@commitlint/config-conventional": "^18.6.0",
"@emotion/react": "11.11.0",
"@emotion/styled": "11.11.0",
"@faker-js/faker": "^8.3.1",
"@faker-js/faker": "^8.4.1",
"@fortawesome/fontawesome-svg-core": "^6.5.1",
"@fortawesome/free-brands-svg-icons": "^6.5.1",
"@fortawesome/free-regular-svg-icons": "^6.5.1",
"@fortawesome/free-solid-svg-icons": "^6.5.1",
"@fortawesome/react-fontawesome": "^0.2.0",
"@octokit/rest": "^20.0.2",
"@storybook/addon-a11y": "7.6.12",
"@storybook/addon-backgrounds": "7.6.12",
"@storybook/addon-docs": "7.6.12",
"@storybook/addon-measure": "7.6.12",
"@storybook/addon-storysource": "7.6.12",
"@storybook/addon-viewport": "7.6.12",
"@storybook/blocks": "7.6.12",
"@storybook/cli": "7.6.12",
"@storybook/manager-api": "7.6.12",
"@storybook/react": "7.6.12",
"@storybook/react-vite": "7.6.12",
"@storybook/theming": "7.6.12",
"@swc-node/jest": "^1.6.8",
"@swc/core": "^1.3.103",
"@testing-library/jest-dom": "^6.2.0",
"@testing-library/react": "^14.0.0",
"@types/jest": "^29.5.10",
"@storybook/addon-a11y": "7.6.13",
"@storybook/addon-backgrounds": "7.6.13",
"@storybook/addon-docs": "7.6.13",
"@storybook/addon-measure": "7.6.13",
"@storybook/addon-storysource": "7.6.13",
"@storybook/addon-viewport": "7.6.13",
"@storybook/blocks": "7.6.13",
"@storybook/cli": "7.6.13",
"@storybook/manager-api": "7.6.13",
"@storybook/react": "7.6.13",
"@storybook/react-vite": "7.6.13",
"@storybook/theming": "7.6.13",
"@swc-node/jest": "^1.7.0",
"@swc/core": "^1.4.0",
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^14.2.1",
"@types/jest": "^29.5.12",
"@types/jsdom": "^21.1.6",
"@types/node": "^20.11.5",
"@types/react": "^18.2.48",
"@types/react-dom": "^18.2.17",
"@typescript-eslint/eslint-plugin": "^6.19.0",
"@typescript-eslint/parser": "^6.19.0",
"@types/node": "^20.11.17",
"@types/react": "^18.2.55",
"@types/react-dom": "^18.2.19",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"@yamada-ui/calendar": "workspace:*",
"@yamada-ui/carousel": "workspace:*",
"@yamada-ui/cli": "workspace:*",
Expand All @@ -113,7 +113,7 @@
"chalk": "^5.3.0",
"csstype": "^3.1.3",
"dayjs": "^1.11.10",
"dotenv": "^16.3.1",
"dotenv": "^16.4.1",
"eslint": "^8.55.0",
"eslint-config-prettier": "^9.1.0",
"eslint-config-react": "^1.1.7",
Expand All @@ -126,7 +126,7 @@
"eslint-plugin-unused-imports": "^3.0.0",
"find-packages": "^10.0.4",
"glob": "^10.3.10",
"husky": "^8.0.3",
"husky": "^9.0.10",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jest-watch-typeahead": "^2.2.2",
Expand All @@ -138,18 +138,18 @@
"prettier": "3.1.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-hook-form": "^7.49.3",
"react-hook-form": "^7.50.1",
"react-icons": "^5.0.0",
"rimraf": "5.0.5",
"storybook": "7.6.12",
"storybook": "7.6.13",
"storybook-dark-mode": "^3.0.3",
"ts-node": "^10.9.1",
"tslib": "^2.6.2",
"tsup": "8.0.1",
"tsx": "^4.6.2",
"turbo": "^1.11.3",
"tsup": "8.0.2",
"tsx": "^4.7.1",
"turbo": "^1.12.3",
"typescript": "^5.3.2",
"vite": "^5.0.12"
"vite": "^5.1.1"
},
"pnpm": {
"overrides": {
Expand Down
72 changes: 72 additions & 0 deletions packages/components/reorder/tests/reorder.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
import { a11y, render, screen } from "@yamada-ui/test"
import { Reorder, ReorderItem, ReorderTrigger } from "../src"

describe("<Reorder />", () => {
test("renders with no errors", async () => {
const { container } = render(
<Reorder>
<ReorderItem label="Item 1">Item 1</ReorderItem>
<ReorderItem label="Item 2">Item 2</ReorderItem>
</Reorder>,
)

screen.getByText("Item 1")
screen.getByText("Item 2")

await a11y(container)
})

test("handles orientation correctly", () => {
render(
<Reorder data-testid="Reorder" orientation="horizontal">
<ReorderItem label="Item 1">Item 1</ReorderItem>
<ReorderItem label="Item 2">Item 2</ReorderItem>
</Reorder>,
)

const reorderList = screen.getByTestId("Reorder")

expect(reorderList).toHaveStyle(`flex-direction: row;`)
})

test("applies correct styles for vertical orientation", () => {
render(
<Reorder data-testid="Reorder" orientation="vertical">
<ReorderItem label="Item 1">Item 1</ReorderItem>
<ReorderItem label="Item 2">Item 2</ReorderItem>
</Reorder>,
)

const reorderList = screen.getByTestId("Reorder")

expect(reorderList).toHaveStyle(`flex-direction: column;`)
})

test("renders trigger correctly inside of an item", () => {
render(
<Reorder data-testid="Reorder" orientation="vertical">
<ReorderItem label="Item 1">
<ReorderTrigger data-testid="ReorderTrigger" />
</ReorderItem>
</Reorder>,
)

screen.getByTestId("ReorderTrigger")
})

test("warns about duplicate", () => {
const warnSpy = jest.spyOn(global.console, "warn")

render(
<Reorder data-testid="Reorder" orientation="vertical">
<ReorderItem label="Item 1">Item 1</ReorderItem>
<ReorderItem label="Item 1">Item 1</ReorderItem>
</Reorder>,
)

expect(warnSpy).toHaveBeenCalledWith(
"Reorder: 'label' of 'ReorderItem' must not be duplicated. duplicate 'label' is 'Item 1' ",
)
expect(warnSpy).toHaveBeenCalledTimes(1)
})
})
Loading

0 comments on commit b35f1df

Please sign in to comment.