sirtimbly/IronCalc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX: Vertical Align by default is bottom

Browse Source
This commit is contained in:
Nicolás Hatcher
2024-10-13 11:35:13 +02:00
committed by Nicolás Hatcher Andrés
parent 9a46e5ccc7
commit 072abb2240
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
webapp/src/components/toolbar.tsx
View File

@@ -144,7 +144,7 @@ function Toolbar(properties: ToolbarProperties) {
$pressed={false} $pressed={false}
onClick={(): void => { onClick={(): void => {
properties.onNumberFormatPicked( properties.onNumberFormatPicked(
decreaseDecimalPlaces(properties.numFmt), decreaseDecimalPlaces(properties.numFmt)
); );
}} }}
disabled={!canEdit} disabled={!canEdit}
@@ -157,7 +157,7 @@ function Toolbar(properties: ToolbarProperties) {
$pressed={false} $pressed={false}
onClick={(): void => { onClick={(): void => {
properties.onNumberFormatPicked( properties.onNumberFormatPicked(
increaseDecimalPlaces(properties.numFmt), increaseDecimalPlaces(properties.numFmt)
); );
}} }}
disabled={!canEdit} disabled={!canEdit}
@@ -257,7 +257,7 @@ function Toolbar(properties: ToolbarProperties) {
$pressed={properties.horizontalAlign === "left"} $pressed={properties.horizontalAlign === "left"}
onClick={() => onClick={() =>
properties.onToggleHorizontalAlign( properties.onToggleHorizontalAlign(
properties.horizontalAlign === "left" ? "general" : "left", properties.horizontalAlign === "left" ? "general" : "left"
) )
} }
disabled={!canEdit} disabled={!canEdit}
@@ -270,7 +270,7 @@ function Toolbar(properties: ToolbarProperties) {
$pressed={properties.horizontalAlign === "center"} $pressed={properties.horizontalAlign === "center"}
onClick={() => onClick={() =>
properties.onToggleHorizontalAlign( properties.onToggleHorizontalAlign(
properties.horizontalAlign === "center" ? "general" : "center", properties.horizontalAlign === "center" ? "general" : "center"
) )
} }
disabled={!canEdit} disabled={!canEdit}
@@ -283,7 +283,7 @@ function Toolbar(properties: ToolbarProperties) {
$pressed={properties.horizontalAlign === "right"} $pressed={properties.horizontalAlign === "right"}
onClick={() => onClick={() =>
properties.onToggleHorizontalAlign( properties.onToggleHorizontalAlign(
properties.horizontalAlign === "right" ? "general" : "right", properties.horizontalAlign === "right" ? "general" : "right"
) )
} }
disabled={!canEdit} disabled={!canEdit}
@@ -294,11 +294,7 @@ function Toolbar(properties: ToolbarProperties) {
<StyledButton <StyledButton
type="button" type="button"
$pressed={properties.verticalAlign === "top"} $pressed={properties.verticalAlign === "top"}
onClick={() => onClick={() => properties.onToggleVerticalAlign("top")}
properties.onToggleVerticalAlign(
properties.verticalAlign === "top" ? "bottom" : "top",
)
}
disabled={!canEdit} disabled={!canEdit}
title={t("toolbar.vertical_align_top")} title={t("toolbar.vertical_align_top")}
> >
@@ -308,9 +304,7 @@ function Toolbar(properties: ToolbarProperties) {
type="button" type="button"
$pressed={properties.verticalAlign === "center"} $pressed={properties.verticalAlign === "center"}
onClick={() => onClick={() =>
properties.onToggleVerticalAlign( properties.onToggleVerticalAlign("center")
properties.verticalAlign === "center" ? "bottom" : "center",
)
} }
disabled={!canEdit} disabled={!canEdit}
title={t("toolbar.vertical_align_middle")} title={t("toolbar.vertical_align_middle")}
@@ -440,7 +434,7 @@ export const StyledButton = styled("button")<TypeButtonProperties>(
borderTopColor: "#F1F2F8", borderTopColor: "#F1F2F8",
}, },
}; };
}, }
); );
const Divider = styled("div")({ const Divider = styled("div")({

2
webapp/src/components/workbook.tsx
View File

@@ -368,7 +368,7 @@ const Workbook = (props: { model: Model; workbookState: WorkbookState }) => {
horizontalAlign={ horizontalAlign={
style.alignment ? style.alignment.horizontal : "general" style.alignment ? style.alignment.horizontal : "general"
} }
verticalAlign={style.alignment ? style.alignment.vertical : "center"} verticalAlign={style.alignment ? style.alignment.vertical : "bottom"}
canEdit={true} canEdit={true}
numFmt={style.num_fmt} numFmt={style.num_fmt}
showGridLines={model.getShowGridLines(model.getSelectedSheet())} showGridLines={model.getShowGridLines(model.getSelectedSheet())}