diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss index 6866c32db29d..f9ea8381d41b 100644 --- a/stylesheets/_modules.scss +++ b/stylesheets/_modules.scss @@ -5353,9 +5353,9 @@ button.module-image__border-overlay:focus { } @include dark-theme { - background: $color-gray-80; + background: $color-gray-75; ::-webkit-scrollbar-thumb { - border: 2px solid $color-gray-80; + border: 2px solid $color-gray-75; } } } diff --git a/stylesheets/components/StoryListItem.scss b/stylesheets/components/StoryListItem.scss index 38db787bca63..02e36b0e1935 100644 --- a/stylesheets/components/StoryListItem.scss +++ b/stylesheets/components/StoryListItem.scss @@ -18,7 +18,10 @@ } } - &:hover { + // highlighted on hover and when it has triggered a context menu + // that has not been closed yet (active) + &:hover, + &--active { background: $color-gray-65; } } diff --git a/ts/components/MyStoriesButton.stories.tsx b/ts/components/MyStoryButton.stories.tsx similarity index 93% rename from ts/components/MyStoriesButton.stories.tsx rename to ts/components/MyStoryButton.stories.tsx index d5b7ca8add24..bdbad995e32c 100644 --- a/ts/components/MyStoriesButton.stories.tsx +++ b/ts/components/MyStoryButton.stories.tsx @@ -7,9 +7,9 @@ import React from 'react'; import { expect } from '@storybook/jest'; import { within, userEvent } from '@storybook/testing-library'; -import type { PropsType } from './MyStoriesButton'; +import type { PropsType } from './MyStoryButton'; import enMessages from '../../_locales/en/messages.json'; -import { MyStoriesButton } from './MyStoriesButton'; +import { MyStoryButton } from './MyStoryButton'; import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation'; import { getFakeStoryView } from '../test-both/helpers/getFakeStory'; import { setupI18n } from '../util/setupI18n'; @@ -19,7 +19,7 @@ const i18n = setupI18n('en', enMessages); export default { title: 'Components/MyStoriesButton', - component: MyStoriesButton, + component: MyStoryButton, argTypes: { hasMultiple: { control: 'checkbox', @@ -41,7 +41,7 @@ export default { }, } as Meta; -const Template: Story = args => ; +const Template: Story = args => ; const interactionTest: PlayFunction = async ({ args, diff --git a/ts/components/MyStoriesButton.tsx b/ts/components/MyStoryButton.tsx similarity index 95% rename from ts/components/MyStoriesButton.tsx rename to ts/components/MyStoryButton.tsx index 3f3ccb2eb9d3..b3273c54be5e 100644 --- a/ts/components/MyStoriesButton.tsx +++ b/ts/components/MyStoryButton.tsx @@ -1,7 +1,7 @@ // Copyright 2022 Signal Messenger, LLC // SPDX-License-Identifier: AGPL-3.0-only -import React from 'react'; +import React, { useState } from 'react'; import classNames from 'classnames'; import type { ConversationType } from '../state/ducks/conversations'; import type { LocalizerType } from '../types/Util'; @@ -53,7 +53,7 @@ function resolveSendStatus( return ResolvedSendStatus.Sent; } -export const MyStoriesButton = ({ +export const MyStoryButton = ({ hasMultiple, i18n, me, @@ -63,6 +63,8 @@ export const MyStoriesButton = ({ queueStoryDownload, showToast, }: PropsType): JSX.Element => { + const [active, setActive] = useState(false); + const { acceptedMessageRequest, avatarPath, @@ -116,13 +118,19 @@ export const MyStoriesButton = ({ ); return ( -
+
unknown; + onContextMenuShowingChanged?: (value: boolean) => void; showToast: ShowToastActionCreatorType; }; @@ -28,11 +29,13 @@ export const StoriesAddStoryButton = ({ moduleClassName, onAddStory, showToast, + onContextMenuShowingChanged, }: PropsType): JSX.Element => { return (
<> - 1 : false }