diff --git a/src/stories/highlight/demo-parts/transcript-diarization.tsx b/src/stories/highlight/demo-parts/transcript-diarization.tsx index 38ce564b..94faa665 100644 --- a/src/stories/highlight/demo-parts/transcript-diarization.tsx +++ b/src/stories/highlight/demo-parts/transcript-diarization.tsx @@ -1,5 +1,5 @@ import { Highlight } from ".."; -import { formatDuration } from "../../player/parts/utils"; +import { formatDuration } from "../../player/utils"; import { SM } from "../../typography/typescale"; import { StoryArgs } from "../index.stories"; import { DemoTranscript as demo } from "./data"; diff --git a/src/stories/highlight/demo-parts/transcript-paragraph.tsx b/src/stories/highlight/demo-parts/transcript-paragraph.tsx index 9ad469aa..6e0c5e98 100644 --- a/src/stories/highlight/demo-parts/transcript-paragraph.tsx +++ b/src/stories/highlight/demo-parts/transcript-paragraph.tsx @@ -1,5 +1,5 @@ import { Highlight } from ".."; -import { formatDuration } from "../../player/parts/utils"; +import { formatDuration } from "../../player/utils"; import { SM } from "../../typography/typescale"; import { StoryArgs } from "../index.stories"; import { DemoTranscript as demo } from "./data"; diff --git a/src/stories/highlight/demo-parts/transcript-sentiment.tsx b/src/stories/highlight/demo-parts/transcript-sentiment.tsx index 382143f5..7a37a8f3 100644 --- a/src/stories/highlight/demo-parts/transcript-sentiment.tsx +++ b/src/stories/highlight/demo-parts/transcript-sentiment.tsx @@ -1,6 +1,6 @@ import { styled } from "styled-components"; import { Highlight } from ".."; -import { formatDuration } from "../../player/parts/utils"; +import { formatDuration } from "../../player/utils"; import { SM } from "../../typography/typescale"; import { StoryArgs } from "../index.stories"; import { DemoTranscript as demo, DemoSentiment } from "./data"; diff --git a/src/stories/highlight/index.tsx b/src/stories/highlight/index.tsx index 2f23ebaa..b2d5c9c4 100644 --- a/src/stories/highlight/index.tsx +++ b/src/stories/highlight/index.tsx @@ -34,7 +34,7 @@ const StyledWord = styled(ZendeskSpan)< const ActiveWord = styled.span` background-color: ${({ theme }) => - getColor(theme.palette.fuschia, 700, undefined, 0.5)}; + getColor(theme.palette.fuschia, 400, undefined, 0.4)}; padding: 0 2px; `; @@ -127,10 +127,10 @@ const Word = (props: WordProps) => { > {isActive ? ( - + ) : ( - + )}{" "} @@ -148,10 +148,10 @@ const Word = (props: WordProps) => { > {isActive ? ( - + ) : ( - + )}{" "} ); diff --git a/src/stories/highlight/searchable.tsx b/src/stories/highlight/searchable.tsx index 95a8cce2..cbdf21c6 100644 --- a/src/stories/highlight/searchable.tsx +++ b/src/stories/highlight/searchable.tsx @@ -3,13 +3,13 @@ import { useHighlightContext } from "./highlightContext"; const StyledSearchWord = styled.span` -background-color: ${({ theme }) => theme.palette.product.talk}; -color: ${({ theme }) => theme.palette.grey[700]};`; + background-color: ${({ theme }) => theme.palette.product.talk}; + color: ${({ theme }) => theme.palette.grey[700]}; +`; + export const Searchable = ({ - start, text, }: { - start: number; text: string; }) => { const { searchTerm } = useHighlightContext(); diff --git a/src/stories/player/_types.tsx b/src/stories/player/_types.tsx index 8acabb59..388857fd 100644 --- a/src/stories/player/_types.tsx +++ b/src/stories/player/_types.tsx @@ -25,9 +25,23 @@ export interface IBookmark { label?: string; tooltipContent?: ReactNode; onClick?: () => void; + tags: VideoTag[]; } export interface WrapperProps { isPlaying?: boolean; isLoaded?: boolean; } + +type VideoTag = { + group: { + id: number; + name: string; + }; + tag: { + id: number; + name: string; + style: string; + usageNumber: number; + }; +}; \ No newline at end of file diff --git a/src/stories/player/parts/progressContext.tsx b/src/stories/player/context/progressContext.tsx similarity index 100% rename from src/stories/player/parts/progressContext.tsx rename to src/stories/player/context/progressContext.tsx diff --git a/src/stories/player/index.tsx b/src/stories/player/index.tsx index 77fd941b..bc5f0d4a 100644 --- a/src/stories/player/index.tsx +++ b/src/stories/player/index.tsx @@ -5,7 +5,7 @@ import { Container } from "./parts/container"; import { Controls } from "./parts/controls"; import { FloatingControls } from "./parts/floatingControls"; import { VideoSpinner } from "./parts/spinner"; -import { ProgressContextProvider } from "./parts/progressContext"; +import { ProgressContextProvider } from "./context/progressContext"; /** * The Player is a styled media tag with custom controls diff --git a/src/stories/player/parts/bookmark.tsx b/src/stories/player/parts/bookmark.tsx index 18862364..a6aee038 100644 --- a/src/stories/player/parts/bookmark.tsx +++ b/src/stories/player/parts/bookmark.tsx @@ -2,7 +2,7 @@ import { useVideoContext } from "@appquality/stream-player"; import { css, styled } from "styled-components"; import { Tooltip } from "../../tooltip"; import { IBookmark } from "../_types"; -import { useProgressContext } from "./progressContext"; +import { useProgressContext } from "../context/progressContext"; import { ReactComponent as GripIcon } from "../../../assets/icons/grip.svg"; const StyledGrabber = styled.div<{ isEnd?: boolean }>` diff --git a/src/stories/player/parts/controls.tsx b/src/stories/player/parts/controls.tsx index 72ebac64..717badfa 100644 --- a/src/stories/player/parts/controls.tsx +++ b/src/stories/player/parts/controls.tsx @@ -8,10 +8,10 @@ import { ControlsGroupCenter } from "./controlsCenterGroup"; import { Cutter } from "./cutterButton"; import { FullScreenButton } from "./fullScreenButton"; import { ProgressBar } from "./progress"; -import { useProgressContext } from "./progressContext"; +import { useProgressContext } from "../context/progressContext"; import { TimeLabel } from "./timeLabel"; import { PlayerTooltip } from "./tooltip"; -import { formatDuration } from "./utils"; +import { formatDuration } from "../utils"; import useDebounce from "../../../hooks/useDebounce"; export const ControlsWrapper = styled.div` diff --git a/src/stories/player/parts/controlsCenterGroup.tsx b/src/stories/player/parts/controlsCenterGroup.tsx index 6c0a59b2..49d46636 100644 --- a/src/stories/player/parts/controlsCenterGroup.tsx +++ b/src/stories/player/parts/controlsCenterGroup.tsx @@ -8,7 +8,7 @@ import { ReactComponent as PlayIcon } from "../../../assets/icons/play-fill.svg" import { ReactComponent as PreviousIcon } from "../../../assets/icons/previous-fill.svg"; import { SM } from "../../typography/typescale"; import { ControlButton } from "./controlButton"; -import { getNextPlaybackRate } from "./utils"; +import { getNextPlaybackRate } from "../utils"; const StyledDiv = styled.div` display: flex; diff --git a/src/stories/player/parts/progress.tsx b/src/stories/player/parts/progress.tsx index 4c1e9c64..4e522613 100644 --- a/src/stories/player/parts/progress.tsx +++ b/src/stories/player/parts/progress.tsx @@ -15,7 +15,7 @@ interface ProgressProps { const StyledProgress = styled(Progress)` width: 100%; border-radius: 0; - color: ${({ theme }) => theme.palette.grey[700]}; + color: ${({ theme }) => theme.palette.grey[400]}; cursor: pointer; > div { border-radius: 0; diff --git a/src/stories/player/parts/timeLabel.tsx b/src/stories/player/parts/timeLabel.tsx index edd6b21f..359c1d05 100644 --- a/src/stories/player/parts/timeLabel.tsx +++ b/src/stories/player/parts/timeLabel.tsx @@ -1,6 +1,6 @@ import styled from "styled-components"; import { SM } from "../../typography/typescale"; -import { formatDuration } from "./utils"; +import { formatDuration } from "../utils"; const StyledDiv = styled.div` display: flex; diff --git a/src/stories/player/parts/utils.ts b/src/stories/player/utils.ts similarity index 100% rename from src/stories/player/parts/utils.ts rename to src/stories/player/utils.ts