Skip to content

Commit

Permalink
Merge pull request #255 from Enterwell/stage
Browse files Browse the repository at this point in the history
Stage
  • Loading branch information
AleksandarDev authored Dec 20, 2023
2 parents 9974cc5 + f75568c commit 90a9aa3
Show file tree
Hide file tree
Showing 10 changed files with 139 additions and 139 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/nextjs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
- name: Build with Next.js
run: pnpm build
- name: Upload artifact
uses: actions/upload-pages-artifact@v2
uses: actions/upload-pages-artifact@v3
with:
path: ./apps/docs/out

Expand All @@ -71,4 +71,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v3
uses: actions/deploy-pages@v4
4 changes: 2 additions & 2 deletions apps/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@
"devDependencies": {
"@types/node": "18.19.3",
"@types/react": "18.2.45",
"@types/react-dom": "18.2.17",
"@types/react-dom": "18.2.18",
"autoprefixer": "10.4.16",
"postcss": "8.4.32",
"tailwindcss": "3.3.6",
"tailwindcss": "3.4.0",
"typescript": "5.3.3",
"unist-builder": "4.0.0",
"unist-util-visit": "5.0.0"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"lint": "turbo run lint"
},
"devDependencies": {
"eslint": "8.55.0",
"eslint": "8.56.0",
"tsconfig": "workspace:*",
"turbo": "1.11.2",
"@turbo/gen": "1.11.2"
Expand Down
4 changes: 2 additions & 2 deletions packages/react-hooks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
"lint": "eslint ."
},
"devDependencies": {
"@microsoft/api-extractor": "7.38.5",
"@microsoft/api-extractor": "7.39.0",
"@types/node": "18.19.3",
"@types/react": "18.2.45",
"@types/react-dom": "18.2.17",
"@types/react-dom": "18.2.18",
"eslint-config-custom": "workspace:*",
"react": "18.2.0",
"rimraf": "5.0.5",
Expand Down
Empty file.
10 changes: 7 additions & 3 deletions packages/react-mui-hooks/hooks/useDataGrid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
type GridValidRowModel,
type DataGridPro,
type GridSortItem,
type GridLocaleText,
type GridRowScrollEndParams,
} from '@mui/x-data-grid-pro';
import { useResizeObserver } from '@enterwell/react-hooks';
Expand Down Expand Up @@ -274,7 +275,8 @@ export type UseDataGridProps = {
checkboxSelection?: boolean,
enablePagination?: boolean,
infiniteLoading?: boolean,
keepNonExistentRowsSelected?: boolean
keepNonExistentRowsSelected?: boolean,
localeText?: Partial<GridLocaleText>
};

/**
Expand Down Expand Up @@ -310,7 +312,8 @@ export function useDataGrid({
checkboxSelection,
enablePagination = true,
infiniteLoading,
keepNonExistentRowsSelected = true
keepNonExistentRowsSelected = true,
localeText = {}
}: UseDataGridProps): UseDataGridResponse {
const defaultSortOrFirst: GridSortModel | undefined = defaultSort || (columns.length > 0 ? [{ field: columns[0].field, sort: 'asc' }] : undefined);

Expand Down Expand Up @@ -540,7 +543,8 @@ export function useDataGrid({
hideFooterSelectedRowCount: true,
loading: loading.length > 0,
localeText: {
noRowsLabel: 'Nema zapisa'
noRowsLabel: 'Nema zapisa',
...localeText
},
onRowClick,
rowHeight,
Expand Down
4 changes: 2 additions & 2 deletions packages/react-mui-hooks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
"devDependencies": {
"@enterwell/react-hooks": "workspace:*",
"@enterwell/react-ui": "workspace:*",
"@microsoft/api-extractor": "7.38.5",
"@microsoft/api-extractor": "7.39.0",
"@mui/material": "5.15.0",
"@mui/x-data-grid-pro": "6.18.5",
"@types/node": "18.19.3",
"@types/react": "18.2.45",
"@types/react-dom": "18.2.17",
"@types/react-dom": "18.2.18",
"date-fns": "2.30.0",
"eslint-config-custom": "workspace:*",
"react": "18.2.0",
Expand Down
4 changes: 3 additions & 1 deletion packages/react-mui-hooks/temp/react-mui-hooks.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { ComponentPropsWithRef } from 'react';
import { DataGridPro } from '@mui/x-data-grid-pro';
import { GridColDef } from '@mui/x-data-grid-pro';
import { GridColumnVisibilityModel } from '@mui/x-data-grid-pro';
import { GridLocaleText } from '@mui/x-data-grid-pro';
import { GridSortItem } from '@mui/x-data-grid-pro';
import { GridSortModel } from '@mui/x-data-grid-pro';
import { GridValidRowModel } from '@mui/x-data-grid-pro';
Expand Down Expand Up @@ -39,7 +40,7 @@ export type TypedSortModel<T> = (GridSortItem & {
})[];

// @public
export function useDataGrid({ tableId, pageSize, columns, columnVisibilityModel, defaultSort, onPage, onRowClick, rowHeight, selection, checkboxSelection, enablePagination, infiniteLoading, keepNonExistentRowsSelected }: UseDataGridProps): UseDataGridResponse;
export function useDataGrid({ tableId, pageSize, columns, columnVisibilityModel, defaultSort, onPage, onRowClick, rowHeight, selection, checkboxSelection, enablePagination, infiniteLoading, keepNonExistentRowsSelected, localeText }: UseDataGridProps): UseDataGridResponse;

// @public
export type UseDataGridProps = {
Expand All @@ -59,6 +60,7 @@ export type UseDataGridProps = {
enablePagination?: boolean;
infiniteLoading?: boolean;
keepNonExistentRowsSelected?: boolean;
localeText?: Partial<GridLocaleText>;
};

// @public
Expand Down
4 changes: 2 additions & 2 deletions packages/react-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@
"@emotion/react": "11.11.1",
"@emotion/styled": "11.11.0",
"@enterwell/react-hooks": "workspace:*",
"@microsoft/api-extractor": "7.38.5",
"@microsoft/api-extractor": "7.39.0",
"@mui/icons-material": "5.15.0",
"@mui/material": "5.15.0",
"@mui/system": "5.15.0",
"@mui/x-date-pickers-pro": "5.0.20",
"@mui/x-date-pickers": "5.0.20",
"@types/node": "18.19.3",
"@types/react": "18.2.45",
"@types/react-dom": "18.2.17",
"@types/react-dom": "18.2.18",
"date-fns": "2.30.0",
"eslint-config-custom": "workspace:*",
"react": "18.2.0",
Expand Down
Loading

0 comments on commit 90a9aa3

Please sign in to comment.