dim colors in invert mode

pull/1452/head
Mikael Finstad 4 years ago
parent ca36b7573c
commit 7abc292d37
No known key found for this signature in database
GPG Key ID: 25AB36E3E81CBC26

@ -296,9 +296,7 @@ const Timeline = memo(({
<TimelineSeg <TimelineSeg
key={seg.segId} key={seg.segId}
segNum={i} segNum={i}
segBgColor={segColor.alpha(0.6).string()} segColor={segColor}
segActiveBgColor={segColor.alpha(0.7).string()}
segBorderColor={segColor.lighten(0.2).string()}
onSegClick={setCurrentSegIndex} onSegClick={setCurrentSegIndex}
isActive={i === currentSegIndexSafe} isActive={i === currentSegIndexSafe}
duration={durationSafe} duration={durationSafe}

@ -1,4 +1,4 @@
import React, { memo } from 'react'; import React, { memo, useMemo } from 'react';
import { motion, AnimatePresence } from 'framer-motion'; import { motion, AnimatePresence } from 'framer-motion';
import { FaTrashAlt } from 'react-icons/fa'; import { FaTrashAlt } from 'react-icons/fa';
@ -7,13 +7,19 @@ import { mySpring } from './animations';
const TimelineSeg = memo(({ const TimelineSeg = memo(({
duration, cutStart, cutEnd, isActive, segNum, name, duration, cutStart, cutEnd, isActive, segNum, name,
onSegClick, invertCutSegments, segBgColor, segActiveBgColor, segBorderColor, formatTimecode, onSegClick, invertCutSegments, segColor, formatTimecode,
}) => { }) => {
const cutSectionWidth = `${((cutEnd - cutStart) / duration) * 100}%`; const cutSectionWidth = `${((cutEnd - cutStart) / duration) * 100}%`;
const startTimePos = `${(cutStart / duration) * 100}%`; const startTimePos = `${(cutStart / duration) * 100}%`;
const markerBorder = `2px solid ${isActive ? segBorderColor : 'transparent'}`;
const backgroundColor = isActive ? segActiveBgColor : segBgColor; const markerBorder = useMemo(() => `2px solid ${isActive ? segColor.lighten(0.2).string() : 'transparent'}`, [isActive, segColor]);
const backgroundColor = useMemo(() => {
if (invertCutSegments) return segColor.alpha(0.4).string();
if (isActive) return segColor.alpha(0.7).string();
return segColor.alpha(0.6).string();
}, [invertCutSegments, isActive, segColor]);
const markerBorderRadius = 5; const markerBorderRadius = 5;
const wrapperStyle = { const wrapperStyle = {
@ -25,7 +31,6 @@ const TimelineSeg = memo(({
display: 'flex', display: 'flex',
alignItems: 'center', alignItems: 'center',
justifyContent: 'space-between', justifyContent: 'space-between',
background: backgroundColor,
originX: 0, originX: 0,
boxSizing: 'border-box', boxSizing: 'border-box',
@ -49,7 +54,7 @@ const TimelineSeg = memo(({
style={wrapperStyle} style={wrapperStyle}
layoutTransition={mySpring} layoutTransition={mySpring}
initial={{ opacity: 0, scaleX: 0 }} initial={{ opacity: 0, scaleX: 0 }}
animate={{ opacity: 1, scaleX: 1 }} animate={{ opacity: 1, scaleX: 1, backgroundColor }}
exit={{ opacity: 0, scaleX: 0 }} exit={{ opacity: 0, scaleX: 0 }}
role="button" role="button"
onClick={onThisSegClick} onClick={onThisSegClick}
@ -66,7 +71,7 @@ const TimelineSeg = memo(({
style={{ width: 16, height: 16, flexShrink: 1 }} style={{ width: 16, height: 16, flexShrink: 1 }}
> >
<FaTrashAlt <FaTrashAlt
style={{ width: '100%', color: segBorderColor }} style={{ width: '100%', color: 'rgba(255,255,255,0.8)' }}
size={16} size={16}
/> />
</motion.div> </motion.div>

Loading…
Cancel
Save