Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge on Master 🔥 #122

Merged
merged 3 commits into from
Sep 21, 2023
Merged

Merge on Master 🔥 #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3653ed8
Small changes related to the Multi Step Voting Feature (#121)
RTAndrew Sep 21, 2023
8a6ae66
chore: update dependencies
ickas Sep 21, 2023
8461561
fix: update `staticDirs` path
ickas Sep 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .storybook/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const config: StorybookConfig = {
core: {
disableTelemetry: true, // 👈 Disables telemetry
},
staticDirs: ['./static'],
staticDirs: ['../static'],
webpackFinal: async (config) => {
config.resolve = {
...config.resolve,
Expand Down
26 changes: 13 additions & 13 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "3.0.3",
"version": "3.0.4",
"name": "@taikai/rocket-kit",
"author": "taikai",
"description": "TAIKAI Design System",
Expand Down Expand Up @@ -66,15 +66,15 @@
"@babel/preset-env": "^7.22.5",
"@babel/preset-typescript": "^7.22.5",
"@size-limit/preset-small-lib": "^4.10.0",
"@storybook/addon-a11y": "^7.0.22",
"@storybook/addon-controls": "^7.0.22",
"@storybook/addon-essentials": "^7.0.22",
"@storybook/addon-links": "^7.0.22",
"@storybook/addon-styling": "^1.3.0",
"@storybook/addons": "^7.0.22",
"@storybook/react": "^7.0.22",
"@storybook/react-webpack5": "^7.0.22",
"@storybook/theming": "^7.0.22",
"@storybook/addon-a11y": "^7.4.1",
"@storybook/addon-controls": "^7.4.1",
"@storybook/addon-essentials": "^7.4.1",
"@storybook/addon-links": "^7.4.1",
"@storybook/addon-styling": "^1.3.7",
"@storybook/addons": "^7.4.1",
"@storybook/react": "^7.4.1",
"@storybook/react-webpack5": "^7.4.1",
"@storybook/theming": "^7.4.1",
"@testing-library/jest-dom": "^5.11.9",
"@testing-library/react": "^11.2.2",
"@testing-library/user-event": "^13.0.7",
Expand All @@ -92,14 +92,14 @@
"dotenv-cli": "^4.0.0",
"eslint-plugin-jest-dom": "^3.6.5",
"eslint-plugin-jsx-a11y": "^6.4.1",
"eslint-plugin-storybook": "^0.6.12",
"eslint-plugin-storybook": "^0.6.13",
"eslint-plugin-testing-library": "^3.10.1",
"husky": "^5.1.3",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-is": "^17.0.1",
"size-limit": "^4.10.0",
"storybook": "^7.0.22",
"storybook": "^7.4.1",
"tsdx": "^0.14.1",
"tslib": "^2.0.3",
"typescript": "^4.2.3",
Expand All @@ -112,7 +112,7 @@
"dependencies": {
"@babel/preset-react": "^7.22.5",
"@types/uuid": "^8.3.4",
"boring-avatars": "^1.5.8",
"boring-avatars": "^1.10.1",
"jest-styled-components": "^7.0.3",
"lodash.throttle": "^4.1.1",
"polished": "^4.1.1",
Expand Down
5 changes: 2 additions & 3 deletions src/atoms/avatar-image/stories/avatar-image.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ PNG.args = {
boringType: 'pixel',
square: false,
alt: 'Maria Rincon',
url:
'https://taikai.azureedge.net/O4f7yrc0ecq0JUEirIk1sZ2XItEpJ-xrIr2W03kRrJs/rs:fit:400:400:0/g:no/aHR0cHM6Ly9zdG9yYWdlLmdvb2dsZWFwaXMuY29tL3RhaWthaS1zdG9yYWdlL2ltYWdlcy90YWlrYWkvbWFyaWFfNDAwXzQwMC5qcGc.jpg',
url: 'https://taikai.azureedge.net/O4f7yrc0ecq0JUEirIk1sZ2XItEpJ-xrIr2W03kRrJs/rs:fit:400:400:0/g:no/aHR0cHM6Ly9zdG9yYWdlLmdvb2dsZWFwaXMuY29tL3RhaWthaS1zdG9yYWdlL2ltYWdlcy90YWlrYWkvbWFyaWFfNDAwXzQwMC5qcGc.jpg',
};

export const SVG = (args: AvatarProps) => <AvatarImage {...args} />;
Expand All @@ -34,7 +33,7 @@ SVG.args = {
boringType: 'pixel',
square: false,
alt: 'Default Avatar',
url: './images/default-avatar.svg',
url: 'images/default-avatar.svg',
};

export const BoringAvatar = (args: AvatarProps) => <AvatarImage {...args} />;
Expand Down
1 change: 1 addition & 0 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export { default as FilePicker } from './atoms/file-picker';

// Molecules
export { default as ActionsMenu } from './molecules/actions-menu';
export { ActionMenuList } from './molecules/actions-menu';
export { default as CardValue } from './molecules/card-value';
export { default as EmptyTable } from './molecules/empty-table';
export { default as ModalFooter } from './molecules/modal-footer';
Expand Down
5 changes: 2 additions & 3 deletions src/molecules/table/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,8 @@ const Table = <CellData extends CellBaseType>(props: TableProps<CellData>) => {
startsOpen = false,
} = props;

const { ref, isVisible, setIsVisible } = useVisible<HTMLDivElement>(
startsOpen
);
const { ref, isVisible, setIsVisible } =
useVisible<HTMLDivElement>(startsOpen);

const [rowData, setRowData] = useState({});
const [rowIndex, setRowIndex] = useState<number | undefined>(undefined);
Expand Down
Loading
Loading