Skip to content

Commit

Permalink
chore: workaround for slider slot to work in react18 and align test f…
Browse files Browse the repository at this point in the history
…or react18
  • Loading branch information
axis-d0op committed Mar 14, 2024
1 parent 2dfa189 commit e54e438
Show file tree
Hide file tree
Showing 11 changed files with 32 additions and 62 deletions.
2 changes: 1 addition & 1 deletion components/password-input/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
"outDir": "lib",
"types": ["vitest/globals"]
},
"exclude": ["**/*.spec.*", "vitest.config.ts"]
"exclude": ["vitest.config.ts"]
}
2 changes: 1 addition & 1 deletion components/slider/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"devDependencies": {
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^12.1.5",
"@testing-library/react": "^14.2.1",
"@testing-library/user-event": "^14.5.2",
"@types/react": "^18.2.65",
"@types/react-dom": "^18.2.8",
Expand Down
2 changes: 1 addition & 1 deletion components/slider/src/range-slider.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import userEvent from "@testing-library/user-event";
import { RangeSlider } from "./range-slider";
import React from "react";
import { getControlRoot } from "./test-helpers";
import { vi } from "vitest";
import { vi, expect } from "vitest";

const expectSliderValues = (elements: HTMLElement[], values: number[]) => {
expect(elements).toHaveLength(values.length);
Expand Down
2 changes: 1 addition & 1 deletion components/slider/src/slider.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { sliderClassNames } from "./use-slider-styles";
import { FluentProvider } from "@fluentui/react-components";
import { Slider } from "./slider";
import { getControlRoot } from "./test-helpers";
import { vi } from "vitest";
import { vi, expect } from "vitest";

const expectSliderValue = (element: HTMLElement, value: number) => {
expect(element.getAttribute("value")).toEqual(value.toString());
Expand Down
3 changes: 2 additions & 1 deletion components/slider/src/thumb/thumb.types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { ChangeEvent } from "react";

export type ThumbSlots = {
root: Slot<"div">;
input: NonNullable<Slot<"input">>;
input: NonNullable<Slot<"input">> & { children?: never };
label: NonNullable<Slot<"span">>;
};

Expand All @@ -17,6 +17,7 @@ export type ThumbProps =
"value"
>
& {
children?: never;
value: number;
handleFocus: () => void;
handleBlur: () => void;
Expand Down
3 changes: 2 additions & 1 deletion components/slider/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
"extends": "./tsconfig.src.json",
"compilerOptions": {
"outDir": "lib",
"types": ["vitest/globals"],
"lib": ["es5", "es6", "dom", "dom.iterable"]
},
"include": ["src"],
"exclude": ["**/*.spec.*", "vitest.config.ts"]
"exclude": ["vitest.config.ts"]
}
2 changes: 1 addition & 1 deletion components/stepper/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"devDependencies": {
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^12.1.5",
"@testing-library/react": "^14.2.1",
"@types/react": "^18.2.65",
"@types/react-dom": "^18.2.8",
"@vitest/coverage-c8": "^0.33.0",
Expand Down
5 changes: 3 additions & 2 deletions components/stepper/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"extends": "./tsconfig.src.json",
"compilerOptions": {
"outDir": "lib"
"outDir": "lib",
"types": ["vitest/globals"]
},
"exclude": ["**/*.spec.*", "vitest.config.ts"]
"exclude": ["vitest.config.ts"]
}
2 changes: 1 addition & 1 deletion components/topbar/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"devDependencies": {
"@testing-library/jest-dom": "^6.4.2",
"@testing-library/react": "^12.1.5",
"@testing-library/react": "^14.2.1",
"@types/react": "^18.2.65",
"@types/react-dom": "^18.2.8",
"@vitest/coverage-c8": "^0.33.0",
Expand Down
7 changes: 5 additions & 2 deletions components/topbar/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"extends": "./tsconfig.src.json",
"compilerOptions": {
"outDir": "lib"
"types": ["vitest/globals"],
"outDir": "lib",
"declaration": false,
"declarationMap": false
},
"include": ["src"],
"exclude": ["**/*.spec.*", "vitest.config.ts"]
"exclude": ["vitest.config.ts"]
}
64 changes: 14 additions & 50 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e54e438

Please sign in to comment.