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

🐛 fix https://github.com/siyuan-note/siyuan/issues/5844

Browse source
This commit is contained in:
Vanessa 2022-09-08 22:04:57 +08:00
parent 59ff5bd547
commit 056c136bc1
5 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/pnpm-lock.yaml generated
View file

@ -1906,10 +1906,10 @@ packages:
resolution: {integrity: sha512-m0+M53+HYMzqKxwNQZT143K7WwXEGUy9LY31l8dJphXx2P/FQod615mVbxHyqbDCG4J5bHdWm21qZ0e2DVY6CQ==} resolution: {integrity: sha512-m0+M53+HYMzqKxwNQZT143K7WwXEGUy9LY31l8dJphXx2P/FQod615mVbxHyqbDCG4J5bHdWm21qZ0e2DVY6CQ==}
engines: {node: '>=14.0.0'} engines: {node: '>=14.0.0'}
dependencies: dependencies:
7zip-bin: 5.1.1
'@develar/schema-utils': 2.6.5 '@develar/schema-utils': 2.6.5
'@electron/universal': 1.2.1 '@electron/universal': 1.2.1
'@malept/flatpak-bundler': 0.4.0 '@malept/flatpak-bundler': 0.4.0
7zip-bin: 5.1.1
async-exit-hook: 2.0.1 async-exit-hook: 2.0.1
bluebird-lst: 1.0.9 bluebird-lst: 1.0.9
builder-util: 23.3.3 builder-util: 23.3.3
@ -2193,9 +2193,9 @@ packages:
/builder-util/23.3.3: /builder-util/23.3.3:
resolution: {integrity: sha512-MJZlUiq2PY5hjYv9+XNaoYdsITqvLgRDoHSFg/4nzpInbNxNjLQOolL04Zsyp+hgfcbFvMC4h0KkR1CMPHLWbA==} resolution: {integrity: sha512-MJZlUiq2PY5hjYv9+XNaoYdsITqvLgRDoHSFg/4nzpInbNxNjLQOolL04Zsyp+hgfcbFvMC4h0KkR1CMPHLWbA==}
dependencies: dependencies:
7zip-bin: 5.1.1
'@types/debug': 4.1.7 '@types/debug': 4.1.7
'@types/fs-extra': 9.0.13 '@types/fs-extra': 9.0.13
7zip-bin: 5.1.1
app-builder-bin: 4.0.0 app-builder-bin: 4.0.0
bluebird-lst: 1.0.9 bluebird-lst: 1.0.9
builder-util-runtime: 9.0.3 builder-util-runtime: 9.0.3

2
app/src/editor/util.ts
View file

@ -349,7 +349,7 @@ export const updatePanelByEditor = (protyle?: IProtyle, focus = true, pushBackSt
}; };
export const isCurrentEditor = (blockId: string) => { export const isCurrentEditor = (blockId: string) => {
const activeElement = document.querySelector(".layout__wnd--active > .layout-tab-bar > .item--focus"); const activeElement = document.querySelector(".layout__wnd--active > .fn__flex > .layout-tab-bar > .item--focus");
if (activeElement) { if (activeElement) {
const tab = getInstanceById(activeElement.getAttribute("data-id")); const tab = getInstanceById(activeElement.getAttribute("data-id"));
if (tab instanceof Tab && tab.model instanceof Editor) { if (tab instanceof Tab && tab.model instanceof Editor) {

4
app/src/layout/Wnd.ts
View file

@ -742,6 +742,10 @@ export class Wnd {
previous.element.style.height = (previous.element.clientHeight + element.clientHeight) + "px"; previous.element.style.height = (previous.element.clientHeight + element.clientHeight) + "px";
} }
} }
// https://github.com/siyuan-note/siyuan/issues/5844
if (layout.children.length > 2 && index === 0) {
layout.children[1].resize = undefined;
}
} }
layout.children.splice(index, 1); layout.children.splice(index, 1);
return true; return true;

2
app/src/layout/dock/Files.ts
View file

@ -162,7 +162,7 @@ export class Files extends Model {
window.siyuan.menus.menu.remove(); window.siyuan.menus.menu.remove();
break; break;
} else if (type === "focus") { } else if (type === "focus") {
const element = document.querySelector(".layout__wnd--active > .layout-tab-bar > .item--focus") || const element = document.querySelector(".layout__wnd--active > .fn__flex > .layout-tab-bar > .item--focus") ||
document.querySelector(".layout-tab-bar > .item--focus"); document.querySelector(".layout-tab-bar > .item--focus");
if (element) { if (element) {
const tab = getInstanceById(element.getAttribute("data-id")) as Tab; const tab = getInstanceById(element.getAttribute("data-id")) as Tab;

2
app/src/util/globalShortcut.ts
View file

@ -809,7 +809,7 @@ const fileTreeKeydown = (event: KeyboardEvent) => {
if (matchHotKey(window.siyuan.config.keymap.general.selectOpen1.custom, event)) { if (matchHotKey(window.siyuan.config.keymap.general.selectOpen1.custom, event)) {
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
const element = document.querySelector(".layout__wnd--active > .layout-tab-bar > .item--focus") || const element = document.querySelector(".layout__wnd--active > .fn__flex > .layout-tab-bar > .item--focus") ||
document.querySelector(".layout-tab-bar > .item--focus"); document.querySelector(".layout-tab-bar > .item--focus");
if (element) { if (element) {
const tab = getInstanceById(element.getAttribute("data-id")) as Tab; const tab = getInstanceById(element.getAttribute("data-id")) as Tab;