Skip to content

Commit 928f586

Browse files
Enforce better modal behavior for edit view dialogs
1 parent 79448a3 commit 928f586

3 files changed

Lines changed: 27 additions & 2 deletions

File tree

src/BloomBrowserUI/bookEdit/ProcessVideoProgressDialog.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from "react";
22
import { ProgressDialog } from "../react_components/Progress/ProgressDialog";
3-
import { post, postDataWithConfig } from "../utils/bloomApi";
3+
import { post, postBoolean, postDataWithConfig } from "../utils/bloomApi";
44
import { useL10n } from "../react_components/l10nHooks";
55
import { ShowEditViewDialog } from "./workspaceRoot";
66
import WebSocketManager from "../utils/WebSocketManager";
@@ -13,6 +13,10 @@ const ProcessVideoProgressDialog: React.FunctionComponent<{
1313
const importStarted = React.useRef(false);
1414
const importFinished = React.useRef(false);
1515

16+
React.useEffect(() => {
17+
postBoolean("editView/setModalState", isOpen);
18+
}, [isOpen]);
19+
1620
const finishImport = (importedPath?: string) => {
1721
if (importFinished.current) {
1822
return;

src/BloomBrowserUI/bookEdit/bookAndPageSettings/BookAndPageSettingsDialog.tsx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import {
1515
} from "../../react_components/BloomDialog/commonDialogComponents";
1616
import {
1717
post,
18+
postBoolean,
1819
postJson,
1920
useApiBoolean,
2021
useApiObject,
@@ -82,6 +83,14 @@ export const BookAndPageSettingsDialog: React.FunctionComponent<{
8283
dialogFrameProvidedExternally: false,
8384
});
8485

86+
React.useEffect(() => {
87+
if (propsForBloomDialog.open === undefined) {
88+
return;
89+
}
90+
91+
postBoolean("editView/setModalState", propsForBloomDialog.open);
92+
}, [propsForBloomDialog.open]);
93+
8594
const appearanceUIOptions: IAppearanceUIOptions =
8695
useApiObject<IAppearanceUIOptions>(
8796
"book/settings/appearanceUIOptions",

src/BloomBrowserUI/react_components/BookGridSetup/BookGridSetupDialog.tsx

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ import {
1111
DialogCancelButton,
1212
DialogOkButton,
1313
} from "../BloomDialog/commonDialogComponents";
14-
import { useWatchApiData, useApiString } from "../../utils/bloomApi";
14+
import {
15+
useWatchApiData,
16+
useApiString,
17+
postBoolean,
18+
} from "../../utils/bloomApi";
1519
import { ShowEditViewDialog } from "../../bookEdit/workspaceRoot";
1620
import { BookGridSetup } from "./BookGridSetup";
1721
import { css } from "@emotion/react";
@@ -39,6 +43,14 @@ export const BookGridSetupDialog: React.FunctionComponent<{
3943
props.initialLinks,
4044
);
4145

46+
React.useEffect(() => {
47+
if (propsForBloomDialog.open === undefined) {
48+
return;
49+
}
50+
51+
postBoolean("editView/setModalState", propsForBloomDialog.open);
52+
}, [propsForBloomDialog.open]);
53+
4254
const unfilteredBooks = useWatchApiData<Array<IBookInfo>>(
4355
`collections/books?realTitle=true`,
4456
[],

0 commit comments

Comments
 (0)