implemented #25

oxdc · Sep 1, 2024 · bbee520 · bbee520
1 parent 78c8825
commit bbee520
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/src/components/Group.tsx b/src/components/Group.tsx
@@ -20,17 +20,15 @@ export const Group = ({ type, children, group }: GroupProps) => {
 	const isSidebar =
 		type === VT.GroupType.LeftSidebar || type === VT.GroupType.RightSidebar;
 	const [isCollapsed, setIsCollapsed] = useState(isSidebar ? true : false);
-	const { groupTitles, setGroupTitle, hiddenGroups, toggleHiddenGroup } =
-		useViewState();
-	const [isHidden, setIsHidden] = useState(
-		group ? hiddenGroups.has(group.id) : false
+	const { groupTitles, setGroupTitle, toggleHiddenGroup } = useViewState();
+	const isHidden = useViewState((state) =>
+		group ? state.hiddenGroups.includes(group.id) : false
 	);
 	const [isEditing, setIsEditing] = useState(false);
 	const toggleCollapsed = () => setIsCollapsed(!isCollapsed);
 	const toggleHidden = () => {
 		if (isSidebar) return;
 		if (group) toggleHiddenGroup(group.id, !isHidden);
-		setIsHidden(!isHidden);
 	};
 	useEffect(() => {
 		if (!group) return;

diff --git a/src/components/Tab.tsx b/src/components/Tab.tsx
@@ -22,7 +22,7 @@ export const Tab = ({ leaf }: TabProps) => {
 	const { bindPinningEvent } = useViewState();
 	const [isPinned, setIsPinned] = useState(leaf.getViewState().pinned);
 	const { sort } = useTabCache();
-	const { lockFocusOnLeaf } = useViewState();
+	const { lockFocusOnLeaf, toggleHiddenGroup } = useViewState();
 	const lastActiveLeaf = useViewState((state) => state.latestActiveLeaf);
 
 	useEffect(() => {
@@ -55,6 +55,7 @@ export const Tab = ({ leaf }: TabProps) => {
 		const workspace = plugin.app.workspace as VT.Workspace;
 		workspace.setActiveLeaf(leaf, { focus: true });
 		workspace.onLayoutChange();
+		toggleHiddenGroup(leaf.parent.id, false);
 		lockFocusOnLeaf(plugin.app, leaf);
 	};
 

diff --git a/src/models/ViewState.ts b/src/models/ViewState.ts
@@ -18,7 +18,7 @@ export const createNewPinningEvents = () =>
 
 interface ViewState {
 	groupTitles: GroupTitles;
-	hiddenGroups: Set<VT.Identifier>;
+	hiddenGroups: Array<VT.Identifier>;
 	latestActiveLeaf: VT.WorkspaceLeaf | null;
 	pinningEvents: PinningEvents;
 	clear: () => void;
@@ -51,15 +51,14 @@ const loadViewState = (): GroupTitles | null => {
 	return new DefaultRecord(factory, entries);
 };
 
-const saveHiddenGroups = (hiddenGroups: Set<VT.Identifier>) => {
-	const data = Array.from(hiddenGroups);
-	localStorage.setItem("hidden-groups", JSON.stringify(data));
+const saveHiddenGroups = (hiddenGroups: Array<VT.Identifier>) => {
+	localStorage.setItem("hidden-groups", JSON.stringify(hiddenGroups));
 };
 
-const loadHiddenGroups = (): Set<VT.Identifier> => {
+const loadHiddenGroups = (): Array<VT.Identifier> => {
 	const data = localStorage.getItem("hidden-groups");
-	if (!data) return new Set();
-	return new Set(JSON.parse(data));
+	if (!data) return [];
+	return JSON.parse(data);
 };
 
 export const useViewState = create<ViewState>()((set, get) => ({
@@ -74,13 +73,16 @@ export const useViewState = create<ViewState>()((set, get) => ({
 			saveViewState(state.groupTitles);
 			return state;
 		}),
-	toggleHiddenGroup: (id: VT.Identifier, isHidden: boolean) =>
-		set((state) => {
-			if (isHidden) state.hiddenGroups.add(id);
-			else state.hiddenGroups.delete(id);
-			saveHiddenGroups(state.hiddenGroups);
-			return state;
-		}),
+	toggleHiddenGroup: (id: VT.Identifier, isHidden: boolean) => {
+		if (isHidden) {
+			set((state) => ({ hiddenGroups: [...state.hiddenGroups, id] }));
+		} else {
+			set((state) => ({
+				hiddenGroups: state.hiddenGroups.filter((gid) => gid !== id),
+			}));
+		}
+		saveHiddenGroups(get().hiddenGroups);
+	},
 	setLatestActiveLeaf(plugin: ObsidianVerticalTabs) {
 		const workspace = plugin.app.workspace as VT.Workspace;
 		const activeView = workspace.getActiveViewOfType(ItemView);