From 95cba7a061b6f574378e78589cff2f782089b7ca Mon Sep 17 00:00:00 2001 From: Iku-turso Date: Mon, 24 Oct 2022 14:19:35 +0300 Subject: [PATCH] Extract being maybe Showable as explicit composable responsibility Co-authored-by: Janne Savolainen Signed-off-by: Iku-turso --- .../utils/composable-responsibilities/showable/showable.ts | 2 ++ .../main/menu-items/application-menu-item-injection-token.ts | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/common/utils/composable-responsibilities/showable/showable.ts b/src/common/utils/composable-responsibilities/showable/showable.ts index 5397600d9a..0aacf417ad 100644 --- a/src/common/utils/composable-responsibilities/showable/showable.ts +++ b/src/common/utils/composable-responsibilities/showable/showable.ts @@ -10,6 +10,8 @@ export interface Showable { isShown: IComputedValue | boolean; } +export type MaybeShowable = Partial; + export const isShown = (showable: Showable | {}) => { if (!("isShown" in showable)) { return true; diff --git a/src/features/application-menu/main/menu-items/application-menu-item-injection-token.ts b/src/features/application-menu/main/menu-items/application-menu-item-injection-token.ts index ebcfd5667f..b90e5e1612 100644 --- a/src/features/application-menu/main/menu-items/application-menu-item-injection-token.ts +++ b/src/features/application-menu/main/menu-items/application-menu-item-injection-token.ts @@ -6,7 +6,7 @@ import { getInjectionToken } from "@ogre-tools/injectable"; import type { BrowserWindow, KeyboardEvent, MenuItemConstructorOptions, MenuItem as ElectronMenuItem } from "electron"; import type { SetOptional } from "type-fest"; import type { ChildOfParentComposite, ParentOfChildComposite } from "../../../../common/utils/composite/interfaces"; -import type { Showable } from "../../../../common/utils/composable-responsibilities/showable/showable"; +import type { MaybeShowable } from "../../../../common/utils/composable-responsibilities/showable/showable"; import type { Discriminable } from "../../../../common/utils/composable-responsibilities/discriminable/discriminable"; import type { Orderable } from "../../../../common/utils/composable-responsibilities/orderable/orderable"; @@ -31,7 +31,7 @@ type ApplicationMenuItemType = & Discriminable & ParentOfChildComposite & ChildOfParentComposite - & Showable + & MaybeShowable & Orderable; export type TopLevelMenu =