diff --git a/package/client/resource/interface/notify.ts b/package/client/resource/interface/notify.ts index 42f59c8..d255514 100644 --- a/package/client/resource/interface/notify.ts +++ b/package/client/resource/interface/notify.ts @@ -22,6 +22,7 @@ interface NotifyProps { style?: Sx; icon?: IconName | [IconPrefix, IconName]; iconColor?: string; + alignIcon?: 'top' | 'center'; } export const notify = (data: NotifyProps): void => exports.ox_lib.notify(data); diff --git a/package/client/resource/interface/textui.ts b/package/client/resource/interface/textui.ts index 9ed897e..70186de 100644 --- a/package/client/resource/interface/textui.ts +++ b/package/client/resource/interface/textui.ts @@ -6,7 +6,9 @@ interface OptionsProps { icon?: IconName | [IconPrefix, IconName]; iconColor?: string; style?: CSSProperties; + alignIcon?: 'top' | 'center'; } + export const showTextUI = (text: string, options?: OptionsProps): void => exports.ox_lib.showTextUI(text, options); export const hideTextUI = (): void => exports.ox_lib.hideTextUI(); diff --git a/resource/interface/client/notify.lua b/resource/interface/client/notify.lua index e3bf629..4030805 100644 --- a/resource/interface/client/notify.lua +++ b/resource/interface/client/notify.lua @@ -11,6 +11,7 @@ ---@field style? { [string]: any } ---@field icon? string | {[1]: IconProp, [2]: string}; ---@field iconColor? string; +---@field alignIcon? 'top' | 'center'; ---`client` ---@param data NotifyProps diff --git a/resource/interface/client/textui.lua b/resource/interface/client/textui.lua index 9f86e44..7c7b426 100644 --- a/resource/interface/client/textui.lua +++ b/resource/interface/client/textui.lua @@ -3,6 +3,7 @@ ---@field icon? string | {[1]: IconProp, [2]: string}; ---@field iconColor? string; ---@field style? string | table; +---@field alignIcon? 'top' | 'center'; local isOpen = false local currentText diff --git a/web/src/features/notifications/NotificationWrapper.tsx b/web/src/features/notifications/NotificationWrapper.tsx index 6a22c98..c7d4199 100644 --- a/web/src/features/notifications/NotificationWrapper.tsx +++ b/web/src/features/notifications/NotificationWrapper.tsx @@ -169,13 +169,22 @@ const Notifications: React.FC = () => { ? 'yellow' : 'blue' } + style={{ alignSelf: !data.alignIcon || data.alignIcon === 'center' ? 'center' : 'start' }} radius="xl" size={32} > ) : ( - + )} )} diff --git a/web/src/features/textui/TextUI.tsx b/web/src/features/textui/TextUI.tsx index 74f85a1..cc1281f 100644 --- a/web/src/features/textui/TextUI.tsx +++ b/web/src/features/textui/TextUI.tsx @@ -52,7 +52,17 @@ const TextUI: React.FC = () => { - {data.icon && } + {data.icon && ( + + )} {data.text} diff --git a/web/src/typings/notifications.ts b/web/src/typings/notifications.ts index b459059..b030f58 100644 --- a/web/src/typings/notifications.ts +++ b/web/src/typings/notifications.ts @@ -12,4 +12,5 @@ export interface NotificationProps { position?: ToastPosition | 'top' | 'bottom'; id?: number | string; type?: string; + alignIcon?: 'top' | 'center'; } diff --git a/web/src/typings/textui.ts b/web/src/typings/textui.ts index 8638bb8..2bacb92 100644 --- a/web/src/typings/textui.ts +++ b/web/src/typings/textui.ts @@ -9,4 +9,5 @@ export interface TextUiProps { icon?: IconProp; iconColor?: string; style?: React.CSSProperties; + alignIcon?: 'top' | 'center'; }