Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-20 08:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 fix https://github.com/siyuan-note/siyuan/issues/7407

Browse source
This commit is contained in:
Vanessa 2023-02-20 15:32:34 +08:00
parent d57f0ca655
commit 1fc0fa0d86
2 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/constants.ts
View file

@ -343,7 +343,7 @@ export abstract class Constants {
hotkeyLangId: "outline", hotkeyLangId: "outline",
}, { }, {
type: "inbox", type: "inbox",
size: {width: 252, height: 0}, size: {width: 320, height: 0},
show: false, show: false,
icon: "iconInbox", icon: "iconInbox",
hotkeyLangId: "inbox", hotkeyLangId: "inbox",

22
app/src/layout/util.ts
View file

@ -19,7 +19,7 @@ import {Dock} from "./dock";
import {focusByRange} from "../protyle/util/selection"; import {focusByRange} from "../protyle/util/selection";
import {hideElements} from "../protyle/ui/hideElements"; import {hideElements} from "../protyle/ui/hideElements";
import {fetchPost} from "../util/fetch"; import {fetchPost} from "../util/fetch";
import {hasClosestBlock} from "../protyle/util/hasClosest"; import {hasClosestBlock, hasClosestByClassName} from "../protyle/util/hasClosest";
import {getContenteditableElement} from "../protyle/wysiwyg/getBlock"; import {getContenteditableElement} from "../protyle/wysiwyg/getBlock";
import {Constants} from "../constants"; import {Constants} from "../constants";
import {openSearch} from "../search/spread"; import {openSearch} from "../search/spread";
@ -610,6 +610,20 @@ export const addResize = (obj: Layout | Wnd) => {
if (!obj.resize) { if (!obj.resize) {
return; return;
} }
const getMinSize = (element: HTMLElement) => {
let minSize = 220;
Array.from(element.querySelectorAll('.file-tree')).find((item) => {
if (item.classList.contains("sy__backlink") || item.classList.contains("sy__graph")
|| item.classList.contains("sy__globalGraph") || item.classList.contains("sy__inbox")) {
if (!item.classList.contains("fn__none") && !hasClosestByClassName(item, "fn__none")) {
minSize = 320
return true;
}
}
})
return minSize
}
const resizeWnd = (resizeElement: HTMLElement, direction: string) => { const resizeWnd = (resizeElement: HTMLElement, direction: string) => {
const setSize = (item: HTMLElement, direction: string) => { const setSize = (item: HTMLElement, direction: string) => {
if (item.classList.contains("fn__flex-1")) { if (item.classList.contains("fn__flex-1")) {
@ -670,10 +684,12 @@ export const addResize = (obj: Layout | Wnd) => {
if (previousNowSize < 8 || nextNowSize < 8) { if (previousNowSize < 8 || nextNowSize < 8) {
return; return;
} }
if (window.siyuan.layout.leftDock?.layout.element.contains(previousElement) && previousNowSize < 220) { if (window.siyuan.layout.leftDock?.layout.element.contains(previousElement) &&
previousNowSize < getMinSize(previousElement)) {
return; return;
} }
if (window.siyuan.layout.rightDock?.layout.element.contains(nextElement) && nextNowSize < 320) { if (window.siyuan.layout.rightDock?.layout.element.contains(nextElement) &&
nextNowSize < getMinSize(nextElement)) {
return; return;
} }
if (!previousElement.classList.contains("fn__flex-1")) { if (!previousElement.classList.contains("fn__flex-1")) {