Skip to content

feat: allow scrollbar being invisible #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
strategy:
matrix:
node_version:
- 14.x
- 16.x
- 18.x
- 20.x
os: [ubuntu-latest, windows-latest, macOS-latest]

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
matrix:
node_version:
- 16.x
- 18.x
steps:
- name: Checkout repository
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion packages/react-dag-editor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"repository": {
"url": "https://github.com/microsoft/react-dag-editor.git"
},
"version": "0.4.3",
"version": "0.4.4",
"dependencies": {
"@fluentui/merge-styles": "^8.2.0",
"eventemitter3": "^4.0.7",
Expand Down
1 change: 1 addition & 0 deletions packages/react-dag-editor/src/lib/Features.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export enum GraphFeatures {
CtrlKeyZoom = "ctrlKeyZoom",
LimitBoundary = "limitBoundary",
EditEdge = "editEdge",
InvisibleScrollbar = "InvisibleScrollbar",
}

export const allFeatures = new Set([
Expand Down
40 changes: 18 additions & 22 deletions packages/react-dag-editor/src/lib/components/Graph/Graph.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ export function Graph<
isHorizontalScrollDisabled,
isA11yEnable,
isCtrlKeyZoomEnable,
isLimitBoundary,
isVirtualizationEnabled,
isScrollbarVisible,
} = featureControl;

useSelectBox(dispatch, state.selectBoxPosition);
Expand Down Expand Up @@ -361,27 +361,23 @@ export function Graph<
/>
)}
</svg>
{(!isVerticalScrollDisabled ||
!isHorizontalScrollDisabled ||
!isPanDisabled) &&
isLimitBoundary &&
isViewportComplete(state.viewport) && (
<Scrollbar
viewport={state.viewport}
offsetLimit={getOffsetLimit({
data,
graphConfig,
rect: state.viewport.rect,
transformMatrix: viewport.transformMatrix,
canvasBoundaryPadding: state.settings.canvasBoundaryPadding,
groupPadding: data.groups[0]?.padding,
})}
dispatch={dispatch}
horizontal={!isHorizontalScrollDisabled}
vertical={!isVerticalScrollDisabled}
eventChannel={eventChannel}
/>
)}
{isScrollbarVisible && isViewportComplete(state.viewport) && (
<Scrollbar
viewport={state.viewport}
offsetLimit={getOffsetLimit({
data,
graphConfig,
rect: state.viewport.rect,
transformMatrix: viewport.transformMatrix,
canvasBoundaryPadding: state.settings.canvasBoundaryPadding,
groupPadding: data.groups[0]?.padding,
})}
dispatch={dispatch}
horizontal={!isHorizontalScrollDisabled}
vertical={!isVerticalScrollDisabled}
eventChannel={eventChannel}
/>
)}
<GraphContextMenu
state={state}
onClick={onContextMenuClick}
Expand Down
7 changes: 7 additions & 0 deletions packages/react-dag-editor/src/lib/hooks/useFeatureControl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ export const useFeatureControl = (features: ReadonlySet<GraphFeatures>) => {
!features.has(GraphFeatures.AddNewNodes) ||
!features.has(GraphFeatures.AddNewEdges);
const isUndoEnabled = features.has(GraphFeatures.UndoStack);
const isScrollbarVisible =
(!isVerticalScrollDisabled ||
!isHorizontalScrollDisabled ||
!isPanDisabled) &&
isLimitBoundary &&
!features.has(GraphFeatures.InvisibleScrollbar);

return {
isNodesDraggable,
Expand All @@ -58,6 +64,7 @@ export const useFeatureControl = (features: ReadonlySet<GraphFeatures>) => {
isDeleteDisabled,
isPasteDisabled,
isUndoEnabled,
isScrollbarVisible,
};
}, [features]);
};