Skip to content
This repository was archived by the owner on Jul 28, 2025. It is now read-only.

Commit 35e882b

Browse files
committed
Merge branch '359-fr-option-to-hide-the-top-bar-+-bottom-bar-the-new-rowfile'
2 parents 284c76d + b36b866 commit 35e882b

File tree

5 files changed

+15
-37
lines changed

5 files changed

+15
-37
lines changed

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"@rollup/plugin-typescript": "8.5.0",
2727
"@testing-library/jest-dom": "5.16.5",
2828
"@testing-library/react": "13.4.0",
29-
"@types/jest": "28.1.8",
29+
"@types/jest": "29.0.3",
3030
"@types/luxon": "3.0.1",
3131
"@types/node": "18.7.18",
3232
"@types/react": "18.0.20",
@@ -35,23 +35,23 @@
3535
"@types/react-datepicker": "4.4.2",
3636
"@types/react-dom": "18.0.6",
3737
"@types/react-window": "1.8.5",
38-
"@typescript-eslint/eslint-plugin": "5.36.2",
39-
"@typescript-eslint/parser": "5.36.2",
38+
"@typescript-eslint/eslint-plugin": "5.37.0",
39+
"@typescript-eslint/parser": "5.37.0",
4040
"eslint": "8.23.1",
41-
"jest": "28.1.3",
42-
"jest-mock-extended": "2.0.7",
41+
"jest": "29.0.3",
42+
"jest-mock-extended": "3.0.1",
4343
"obsidian": "0.15.9",
4444
"rollup": "2.79.0",
4545
"rollup-plugin-terser": "7.0.2",
4646
"rollup-plugin-typescript2": "0.34.0",
47-
"ts-jest": "28.0.8",
47+
"ts-jest": "29.0.1",
4848
"tslib": "2.4.0",
4949
"typescript": "4.8.3"
5050
},
5151
"dependencies": {
5252
"@emotion/styled": "11.10.4",
5353
"@mui/icons-material": "5.10.3",
54-
"@mui/material": "5.10.4",
54+
"@mui/material": "5.10.5",
5555
"@popperjs/core": "2.11.6",
5656
"@tanstack/match-sorter-utils": "8.1.1",
5757
"@tanstack/react-table": "8.5.13",

src/components/NavBar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export function NavBar(navBarProps: NavBarProps) {
5959
};
6060

6161
return (
62-
<Box sx={{ flexGrow: 1 }}>
62+
<>
6363
<AppBar
6464
position="static"
6565
style={{
@@ -143,7 +143,7 @@ export function NavBar(navBarProps: NavBarProps) {
143143
pointerEvents: "none",
144144
}}
145145
/>
146-
</Box>
146+
</>
147147
);
148148
}
149149
export function HeaderNavBar(headerNavBarProps: NavBarProps) {

src/components/cellTypes/NumberCell.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ const NumberCell = (props: CellComponentProps) => {
2828
// onChange handler
2929
const handleOnChange: ChangeEventHandler<HTMLInputElement> = (event) => {
3030
// parse value to number
31-
const value = parseFloat(event.target.value);
32-
setEditableValue(value);
31+
setEditableValue(event.target.value);
3332
};
3433

3534
function persistChange(changedValue: number) {
@@ -51,7 +50,7 @@ const NumberCell = (props: CellComponentProps) => {
5150
};
5251

5352
const handleOnBlur = () => {
54-
persistChange(editableValue);
53+
persistChange(parseFloat(editableValue));
5554
setDirtyCell(false);
5655
};
5756

@@ -69,7 +68,9 @@ const NumberCell = (props: CellComponentProps) => {
6968
onClick={handleEditableOnclick}
7069
style={{ width: column.getSize() }}
7170
>
72-
{(numberRow[column.id] && numberRow[column.id].toString()) || ""}
71+
{(numberRow[column.id] !== undefined &&
72+
numberRow[column.id].toString()) ||
73+
""}
7374
</span>
7475
);
7576
};

src/components/img/MenuUpIcon.tsx

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/components/reducers/DataviewFilters.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ import { obtainColumnsFromRows } from "components/Columns";
55
import FilterOffIcon from "components/img/FilterOffIcon";
66
import FilterOnIcon from "components/img/FilterOnIcon";
77
import MenuDownIcon from "components/img/MenuDownIcon";
8-
import MenuUpIcon from "components/img/MenuUpIcon";
98
import { FiltersModal } from "components/modals/filters/FiltersModal";
10-
import DataviewFiltersPortal from "components/portals/DataviewFiltersPortal";
119
import React from "react";
1210

1311
export default function DataviewFilters(props: DataviewFiltersProps) {
@@ -80,7 +78,7 @@ export default function DataviewFilters(props: DataviewFiltersProps) {
8078
key={`Span-FilterConditions-Ref-Portal`}
8179
>
8280
<div key={`Div-FilterConditions-Ref-Portal`}>
83-
<MenuUpIcon />
81+
<MenuDownIcon />
8482
</div>
8583
</span>
8684
</Button>

0 commit comments

Comments
 (0)