mirror of
https://github.com/excalidraw/excalidraw.git
synced 2025-04-14 16:40:58 -04:00
* feat: Sidebar tabs support [wip] * tab trigger styling tweaks * add `:hover` & `:active` states * replace `@dwelle/tunnel-rat` with `tunnel-rat` * make stuff more explicit - remove `Sidebar.Header` fallback (host apps need to render manually), and stop tunneling it (render in place) - make `docked` state explicit - stop tunneling `Sidebar.TabTriggers` (render in place) * redesign sidebar / library as per latest spec * support no label on `Sidebar.Trigger` * add Sidebar `props.onStateChange` * style fixes * make `appState.isSidebarDocked` into a soft user preference * px -> rem & refactor * remove `props.renderSidebar` * update tests * remove * refactor * rename constants * tab triggers styling fixes * factor out library-related logic from generic sidebar trigger * change `props.onClose` to `onToggle` * rename `props.value` -> `props.tab` * add displayNames * allow HTMLAttributes on applicable compos * fix example App * more styling tweaks and fixes * fix not setting `dockable` * more style fixes * fix and align sidebar header button styling * make DefaultSidebar dockable on if host apps supplies `onDock` * stop `Sidebar.Trigger` hiding label on mobile this should be only the default sidebar trigger behavior, and for that we don't need to use `device` hook as we handle in CSS * fix `dockable` prop of defaultSidebar * remove extra `typescript` dep * remove `defaultTab` prop in favor of explicit `tab` value in `<Sidebar.Trigger/>` and `toggleSidebar()`, to reduce API surface area and solve inconsistency of `appState.openSidebar.tab` not reflecting actual UI value if `defaultTab` was supported (without additional syncing logic which feels like the wrong solution). * remove `onToggle` in favor of `onStateChange` reducing API surface area * fix restore * comment no longer applies * reuse `Button` component in sidebar buttons * fix tests * split Sidebar sub-components into files * remove `props.dockable` in favor of `props.onDock` only * split tests * fix sidebar showing dock button if no `props.docked` supplied & add more tests * reorder and group sidebar tests * clarify * rename classes & dedupe css * refactor tests * update changelog * update changelog --------- Co-authored-by: barnabasmolnar <barnabas@excalidraw.com>
66 lines
1.7 KiB
TypeScript
66 lines
1.7 KiB
TypeScript
import { atom, useAtom } from "jotai";
|
|
import React, { useLayoutEffect } from "react";
|
|
import { useTunnels } from "../../context/tunnels";
|
|
|
|
export const withInternalFallback = <P,>(
|
|
componentName: string,
|
|
Component: React.FC<P>,
|
|
) => {
|
|
const renderAtom = atom(0);
|
|
// flag set on initial render to tell the fallback component to skip the
|
|
// render until mount counter are initialized. This is because the counter
|
|
// is initialized in an effect, and thus we could end rendering both
|
|
// components at the same time until counter is initialized.
|
|
let preferHost = false;
|
|
|
|
let counter = 0;
|
|
|
|
const WrapperComponent: React.FC<
|
|
P & {
|
|
__fallback?: boolean;
|
|
}
|
|
> = (props) => {
|
|
const { jotaiScope } = useTunnels();
|
|
const [, setRender] = useAtom(renderAtom, jotaiScope);
|
|
|
|
useLayoutEffect(() => {
|
|
setRender((c) => {
|
|
const next = c + 1;
|
|
counter = next;
|
|
|
|
return next;
|
|
});
|
|
return () => {
|
|
setRender((c) => {
|
|
const next = c - 1;
|
|
counter = next;
|
|
if (!next) {
|
|
preferHost = false;
|
|
}
|
|
return next;
|
|
});
|
|
};
|
|
}, [setRender]);
|
|
|
|
if (!props.__fallback) {
|
|
preferHost = true;
|
|
}
|
|
|
|
// ensure we don't render fallback and host components at the same time
|
|
if (
|
|
// either before the counters are initialized
|
|
(!counter && props.__fallback && preferHost) ||
|
|
// or after the counters are initialized, and both are rendered
|
|
// (this is the default when host renders as well)
|
|
(counter > 1 && props.__fallback)
|
|
) {
|
|
return null;
|
|
}
|
|
|
|
return <Component {...props} />;
|
|
};
|
|
|
|
WrapperComponent.displayName = componentName;
|
|
|
|
return WrapperComponent;
|
|
};
|