A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
web: add support for macOS like pane resizing logic
Abdullah Atta263c970320e0
diff --git a/apps/web/src/app.tsx b/apps/web/src/app.tsxindex 8951874eb..24aa6d1e9 100644--- a/apps/web/src/app.tsx+++ b/apps/web/src/app.tsx@@ -156,7 +156,7 @@ function DesktopAppContents({ show, setShow }: DesktopAppContentsProps) {</Flex>) : (!isFocusMode && (- <Pane minSize={50} snapSize={120}>+ <Pane minSize={50} snapSize={120} maxSize={300}><NavigationMenutoggleNavigationContainer={(state) => {setShow(state || !show);@@ -167,7 +167,11 @@ function DesktopAppContents({ show, setShow }: DesktopAppContentsProps) {))}{!isFocusMode && show && (- <Pane style={{ flex: 1, display: "flex" }} snapSize={200}>+ <Pane+ style={{ flex: 1, display: "flex" }}+ snapSize={200}+ maxSize={500}+ ><ScopedThemeProviderclassName="listMenu"scope="list"diff --git a/apps/web/src/components/split-pane/index.tsx b/apps/web/src/components/split-pane/index.tsxindex 86caf3902..6a36281f7 100644--- a/apps/web/src/components/split-pane/index.tsx+++ b/apps/web/src/components/split-pane/index.tsx@@ -228,7 +228,10 @@ export const SplitPane = React.forwardRef<);const onDragging = useCallback(- function (e: React.MouseEvent<HTMLDivElement, MouseEvent>, i: number) {+ function onDragging(+ e: React.MouseEvent<HTMLDivElement, MouseEvent>,+ i: number+ ) {const curAxis = { x: e.pageX, y: e.pageY };let distanceX = curAxis[splitAxis] - axis.current[splitAxis];axis.current = { x: e.pageX, y: e.pageY };@@ -241,16 +244,29 @@ export const SplitPane = React.forwardRef<if (currentSize + distanceX >= rightBorder)distanceX = rightBorder - currentSize;- if (currentSize + distanceX < currentPaneLimits.min) return;- if (currentSize + distanceX > currentPaneLimits.max) return;-const nextSizes = [...sizes.current];- nextSizes[i] += distanceX;- nextSizes[i + 1] -= distanceX;- if (nextSizes[i + 1] < nextPaneLimits.min)- nextSizes[i + 1] = nextPaneLimits.min;+ // if current pane size is out of limit, adjust the previous pane+ if (+ currentSize + distanceX > currentPaneLimits.max ||+ currentSize + distanceX < currentPaneLimits.min+ ) {+ if (i - 1 >= 0) {+ // reset axis+ axis.current[splitAxis] += -distanceX;+ onDragging(e, i - 1);+ }+ return;+ }++ nextSizes[i] += distanceX;+ // keep the next pane size in the min-max range+ nextSizes[i + 1] = Math.min(+ nextPaneLimits.max,+ Math.max(nextPaneLimits.min, nextSizes[i + 1] - distanceX)+ );+ // snapping logicif (currentPaneLimits.snap > 0 && distanceX <= 0) {if (nextSizes[i] <= currentPaneLimits.snap / 2)nextSizes[i] = currentPaneLimits.min;