diff --git a/src/assets/images/fusion/background.png b/src/assets/images/fusion/background.png deleted file mode 100644 index 01ad341..0000000 Binary files a/src/assets/images/fusion/background.png and /dev/null differ diff --git a/src/assets/images/fusion/cards/card-close.png b/src/assets/images/fusion/cards/card-close.png deleted file mode 100644 index e3b32a9..0000000 Binary files a/src/assets/images/fusion/cards/card-close.png and /dev/null differ diff --git a/src/assets/images/fusion/cards/yellow-bg.png b/src/assets/images/fusion/cards/yellow-bg.png deleted file mode 100644 index b4db3be..0000000 Binary files a/src/assets/images/fusion/cards/yellow-bg.png and /dev/null differ diff --git a/src/assets/images/fusion/friends/online.png b/src/assets/images/fusion/friends/online.png deleted file mode 100644 index 99464d6..0000000 Binary files a/src/assets/images/fusion/friends/online.png and /dev/null differ diff --git a/src/assets/images/fusion/friends/search.png b/src/assets/images/fusion/friends/search.png deleted file mode 100644 index 81deba3..0000000 Binary files a/src/assets/images/fusion/friends/search.png and /dev/null differ diff --git a/src/common/Button.tsx b/src/common/Button.tsx index e93039d..0fe8695 100644 --- a/src/common/Button.tsx +++ b/src/common/Button.tsx @@ -12,13 +12,16 @@ export interface ButtonProps extends FlexProps export const Button: FC = props => { - const { variant = 'primary', size = 'sm', active = false, disabled = false, classNames = [], ...rest } = props; + const { variant = 'primary', size = 'sm', active = false, disabled = false, classNames = [], outline = false, tp = false, ...rest } = props; const getClassNames = useMemo(() => { const newClassNames: string[] = [ 'btn' ]; - if(variant) newClassNames.push('btn-' + variant); + if(outline && variant) newClassNames.push('btn-outline-' + variant) + else if (variant) newClassNames.push('btn-' + variant); + + if (tp) newClassNames.push('btn-transparent'); if(size) newClassNames.push('btn-' + size); @@ -29,7 +32,7 @@ export const Button: FC = props => if(classNames.length) newClassNames.push(...classNames); return newClassNames; - }, [ variant, size, active, disabled, classNames ]); + }, [ variant, size, active, disabled, classNames, outline ]); return ; } diff --git a/src/common/card/tabs/NitroCardTabsView.tsx b/src/common/card/tabs/NitroCardTabsView.tsx index a365872..ddc89a6 100644 --- a/src/common/card/tabs/NitroCardTabsView.tsx +++ b/src/common/card/tabs/NitroCardTabsView.tsx @@ -3,7 +3,7 @@ import { Flex, FlexProps } from '../..'; export const NitroCardTabsView: FC = props => { - const { justifyContent = 'center', gap = 1, classNames = [], children = null, ...rest } = props; + const { justifyContent = 'start', gap = 1, classNames = [], children = null, ...rest } = props; const getClassNames = useMemo(() => { diff --git a/src/common/draggable-window/DraggableWindow.tsx b/src/common/draggable-window/DraggableWindow.tsx index 286d51d..076f67e 100644 --- a/src/common/draggable-window/DraggableWindow.tsx +++ b/src/common/draggable-window/DraggableWindow.tsx @@ -2,10 +2,11 @@ import { MouseEventType, TouchEventType } from '@nitrots/nitro-renderer'; import { CSSProperties, FC, Key, MouseEvent as ReactMouseEvent, ReactNode, TouchEvent as ReactTouchEvent, useCallback, useEffect, useRef, useState } from 'react'; import { createPortal } from 'react-dom'; import { Base } from '..'; -import { GetLocalStorage, SetLocalStorage, WindowSaveOptions } from '../../api'; +import { GetLocalStorage, WindowSaveOptions } from '../../api'; import { DraggableWindowPosition } from './DraggableWindowPosition'; const CURRENT_WINDOWS: HTMLElement[] = []; +const POS_MEMORY: Map = new Map(); const BOUNDS_THRESHOLD_TOP: number = 0; const BOUNDS_THRESHOLD_LEFT: number = 0; @@ -138,15 +139,9 @@ export const DraggableWindow: FC = props => setOffset({ x: offsetX, y: offsetY }); setIsDragging(false); - if(uniqueKey !== null) - { - const newStorage = { ...GetLocalStorage(`nitro.windows.${ uniqueKey }`) } as WindowSaveOptions; - - newStorage.offset = { x: offsetX, y: offsetY }; - - SetLocalStorage(`nitro.windows.${ uniqueKey }`, newStorage); - } - }, [ dragHandler, delta, offset, uniqueKey ]); + if(uniqueKey !== null) POS_MEMORY.set(uniqueKey, { + x: offsetX, y: offsetY }); + }, [ dragHandler, delta, offset, uniqueKey ]); const onDragMouseUp = useCallback((event: MouseEvent) => { @@ -193,6 +188,17 @@ export const DraggableWindow: FC = props => element.style.left = 50 + offsetLeft + 'px'; break; } + + if(uniqueKey !== null) + { + const memory = POS_MEMORY.get(uniqueKey); + + if(memory) + { + offsetX = memory.x; + offsetY = memory.y; + } + } setDelta({ x: 0, y: 0 }); setOffset({ x: offsetX, y: offsetY }); diff --git a/src/common/layout/LayoutNotificationAlertView.tsx b/src/common/layout/LayoutNotificationAlertView.tsx index 8db771a..1671b00 100644 --- a/src/common/layout/LayoutNotificationAlertView.tsx +++ b/src/common/layout/LayoutNotificationAlertView.tsx @@ -1,4 +1,4 @@ -import { FC, useMemo } from 'react'; +import { FC, ReactNode, useMemo } from 'react'; import { NotificationAlertType } from '../../api'; import { NitroCardContentView, NitroCardHeaderView, NitroCardView, NitroCardViewProps } from '../card'; @@ -11,7 +11,7 @@ export interface LayoutNotificationAlertViewProps extends NitroCardViewProps export const LayoutNotificationAlertView: FC = props => { - const { title = '', onClose = null, classNames = [], children = null,type = NotificationAlertType.DEFAULT, ...rest } = props; + const { title = '', onClose = null, classNames = [], children = null,type = NotificationAlertType.DEFAULT, options = null, ...rest } = props; const getClassNames = useMemo(() => { @@ -30,6 +30,7 @@ export const LayoutNotificationAlertView: FC = { children } + { options } ); } diff --git a/src/components/friends/FriendsView.scss b/src/components/friends/FriendsView.scss index b4f69e1..6c355eb 100644 --- a/src/components/friends/FriendsView.scss +++ b/src/components/friends/FriendsView.scss @@ -124,9 +124,10 @@ position: relative; padding-left:38px; text-align: left; + pointer-events: all; &.friend-bar-item-active { - margin-bottom:21px; + } &.friend-bar-search-item-active { @@ -177,6 +178,23 @@ } } +.friends-myinfo { + > :first-child { + border-bottom: 1px dashed white; + } + + .myinfo-avatar { + height: 60px; + width: 60px; + display: flex; + justify-content: center; + + .avatar-image { + margin-top: -17px; + } + } +} + .nitro-friends-messenger { width: $messenger-width; height: $messenger-height; diff --git a/src/components/friends/views/friends-bar/FriendBarItemView.tsx b/src/components/friends/views/friends-bar/FriendBarItemView.tsx index 4d0f485..c5db1e3 100644 --- a/src/components/friends/views/friends-bar/FriendBarItemView.tsx +++ b/src/components/friends/views/friends-bar/FriendBarItemView.tsx @@ -49,10 +49,10 @@ export const FriendBarItemView: FC<{ friend: MessengerFriend }> = props => return (
setVisible(prevValue => !prevValue) }>
0 ? 'avatar': 'group' }` }> - { (friend.id > 0) && } - 0) && } + 0 ? friend.figure : (friend.id <= 0 && friend.figure === 'ADM') ? 'ha-3409-1413-70.lg-285-89.ch-3032-1334-109.sh-3016-110.hd-185-1359.ca-3225-110-62.wa-3264-62-62.fa-1206-90.hr-3322-1403' : friend.figure - } isgroup={friend.id <= 0 ? 1 : 0} direction={friend.id > 0 ? 2 : 3} /> + } isgroup={friend.id <= 0 ? 1 : 0} direction={isVisible ? 2 : 3} />
{ friend.name }