Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5676,6 +5676,7 @@ function App() {
)
}
/>
<GlobalTooltip appSettings={appSettings} />
</div>
);
}
Expand All @@ -5684,7 +5685,6 @@ const AppWrapper = () => (
<ClerkProvider publishableKey={CLERK_PUBLISHABLE_KEY}>
<ContextMenuProvider>
<App />
<GlobalTooltip />
</ContextMenuProvider>
</ClerkProvider>
);
Expand Down
8 changes: 8 additions & 0 deletions src/components/adjustments/Basic.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import clsx from 'clsx';
import Slider from '../ui/Slider';
import { Adjustments, BasicAdjustment } from '../../utils/adjustments';
import { useEffect, useRef, useState } from 'react';
import { TOOLTIP_TEXT } from '../../utils/tooltipText';

interface BasicAdjustmentsProps {
adjustments: Adjustments;
Expand Down Expand Up @@ -133,6 +134,7 @@ const ToneMapperSwitch = ({
value={exposureValue}
trackClassName="bg-surface"
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.basic.toneMapperExposure}
/>
</div>
</div>
Expand Down Expand Up @@ -168,6 +170,7 @@ export default function BasicAdjustments({
step={0.01}
value={adjustments.brightness}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.basic.brightness}
/>
<Slider
label="Contrast"
Expand All @@ -177,6 +180,7 @@ export default function BasicAdjustments({
step={1}
value={adjustments.contrast}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.basic.contrast}
/>
<Slider
label="Highlights"
Expand All @@ -186,6 +190,7 @@ export default function BasicAdjustments({
step={1}
value={adjustments.highlights}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.basic.highlights}
/>
<Slider
label="Shadows"
Expand All @@ -195,6 +200,7 @@ export default function BasicAdjustments({
step={1}
value={adjustments.shadows}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.basic.shadows}
/>
<Slider
label="Whites"
Expand All @@ -204,6 +210,7 @@ export default function BasicAdjustments({
step={1}
value={adjustments.whites}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.basic.whites}
/>
<Slider
label="Blacks"
Expand All @@ -213,6 +220,7 @@ export default function BasicAdjustments({
step={1}
value={adjustments.blacks}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.basic.blacks}
/>

{isForMask ? (
Expand Down
12 changes: 12 additions & 0 deletions src/components/adjustments/Color.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { Adjustments, ColorGrading } from '../../utils/adjustments';
import { AppSettings } from '../ui/AppProperties';
import Text from '../ui/Text';
import { TextColors, TextVariants, TextWeights } from '../../types/typography';
import { TOOLTIP_TEXT } from '../../utils/tooltipText';

interface ColorProps {
color: string;
Expand Down Expand Up @@ -273,6 +274,7 @@ const ColorGradingPanel = ({ adjustments, setAdjustments, onDragStateChange }: C
step={1}
value={colorGrading.blending}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.color.colorGrading.blending}
/>
<Slider
defaultValue={0}
Expand All @@ -283,6 +285,7 @@ const ColorGradingPanel = ({ adjustments, setAdjustments, onDragStateChange }: C
step={1}
value={colorGrading.balance}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.color.colorGrading.balance}
/>
</div>
</div>
Expand Down Expand Up @@ -346,6 +349,7 @@ const ColorCalibrationPanel = ({ adjustments, setAdjustments, onDragStateChange
onChange={(e: any) => handleShadowsChange(e.target.value)}
onDragStateChange={onDragStateChange}
trackClassName="tint-gradient-track"
data-tooltip={TOOLTIP_TEXT.color.colorCalibration.tint}
/>
</div>
<div className="mt-3">
Expand Down Expand Up @@ -373,6 +377,7 @@ const ColorCalibrationPanel = ({ adjustments, setAdjustments, onDragStateChange
onChange={(e: any) => handlePrimaryChange('Hue', e.target.value)}
onDragStateChange={onDragStateChange}
trackClassName={`hue-slider-${trackSuffix}`}
data-tooltip={TOOLTIP_TEXT.color.colorCalibration.hue}
/>
<Slider
label="Saturation"
Expand All @@ -384,6 +389,7 @@ const ColorCalibrationPanel = ({ adjustments, setAdjustments, onDragStateChange
onChange={(e: any) => handlePrimaryChange('Saturation', e.target.value)}
onDragStateChange={onDragStateChange}
trackClassName={`sat-slider-${trackSuffix}`}
data-tooltip={TOOLTIP_TEXT.color.colorCalibration.saturation}
/>
</div>
</div>
Expand Down Expand Up @@ -472,6 +478,7 @@ export default function ColorPanel({
value={adjustments.temperature || 0}
trackClassName="temperature-gradient-track"
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.color.whiteBalance.temperature}
/>
<Slider
label="Tint"
Expand All @@ -482,6 +489,7 @@ export default function ColorPanel({
value={adjustments.tint || 0}
trackClassName="tint-gradient-track"
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.color.whiteBalance.tint}
/>
</div>

Expand All @@ -497,6 +505,7 @@ export default function ColorPanel({
step={1}
value={adjustments.vibrance || 0}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.color.presence.vibrance}
/>
<Slider
label="Saturation"
Expand All @@ -506,6 +515,7 @@ export default function ColorPanel({
step={1}
value={adjustments.saturation || 0}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.color.presence.saturation}
/>
</div>

Expand Down Expand Up @@ -545,6 +555,7 @@ export default function ColorPanel({
value={currentHsl.hue}
trackClassName={hue_slider}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.color.colorMixer.hue}
/>
<Slider
label="Saturation"
Expand All @@ -555,6 +566,7 @@ export default function ColorPanel({
value={currentHsl.saturation}
trackClassName={saturation_slider}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.color.colorMixer.saturation}
/>
<Slider
label="Luminance"
Expand Down
8 changes: 8 additions & 0 deletions src/components/adjustments/Details.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { Adjustments, DetailsAdjustment } from '../../utils/adjustments';
import { AppSettings } from '../ui/AppProperties';
import Text from '../ui/Text';
import { TextVariants } from '../../types/typography';
import { TOOLTIP_TEXT } from '../../utils/tooltipText';

interface DetailsPanelProps {
adjustments: Adjustments;
Expand Down Expand Up @@ -41,6 +42,7 @@ export default function DetailsPanel({
step={1}
value={adjustments.sharpness}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.details.sharpening.sharpness}
/>
</div>
)}
Expand All @@ -58,6 +60,7 @@ export default function DetailsPanel({
step={1}
value={adjustments.clarity}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.details.presence.clarity}
/>
<Slider
label="Dehaze"
Expand All @@ -67,6 +70,7 @@ export default function DetailsPanel({
step={1}
value={adjustments.dehaze}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.details.presence.dehaze}
/>
<Slider
label="Structure"
Expand All @@ -76,6 +80,7 @@ export default function DetailsPanel({
step={1}
value={adjustments.structure}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.details.presence.structure}
/>
{!isForMask && (
<Slider
Expand All @@ -86,6 +91,7 @@ export default function DetailsPanel({
step={1}
value={adjustments.centré}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.details.presence.centré}
/>
)}
</div>
Expand Down Expand Up @@ -128,6 +134,7 @@ export default function DetailsPanel({
step={1}
value={adjustments.chromaticAberrationRedCyan}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.details.chromaticAberration.redCyan}
/>
<Slider
label="Blue/Yellow"
Expand All @@ -139,6 +146,7 @@ export default function DetailsPanel({
step={1}
value={adjustments.chromaticAberrationBlueYellow}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.details.chromaticAberration.blueYellow}
/>
</div>
)}
Expand Down
11 changes: 11 additions & 0 deletions src/components/adjustments/Effects.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import LUTControl from '../ui/LUTControl';
import { AppSettings } from '../ui/AppProperties';
import Text from '../ui/Text';
import { TextVariants } from '../../types/typography';
import { TOOLTIP_TEXT } from '../../utils/tooltipText';

interface EffectsPanelProps {
adjustments: Adjustments;
Expand Down Expand Up @@ -59,6 +60,7 @@ export default function EffectsPanel({
step={1}
value={adjustments.glowAmount}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.effects.creative.glow}
/>

<Slider
Expand All @@ -69,6 +71,7 @@ export default function EffectsPanel({
step={1}
value={adjustments.halationAmount}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.effects.creative.halation}
/>

{!isForMask && (
Expand All @@ -80,6 +83,7 @@ export default function EffectsPanel({
step={1}
value={adjustments.flareAmount}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.effects.creative.lightFlares}
/>
)}
</div>
Expand Down Expand Up @@ -113,6 +117,7 @@ export default function EffectsPanel({
step={1}
value={adjustments.vignetteAmount}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.effects.vignette.amount}
/>
<Slider
defaultValue={50}
Expand All @@ -123,6 +128,7 @@ export default function EffectsPanel({
step={1}
value={adjustments.vignetteMidpoint}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.effects.vignette.midpoint}
fillOrigin="min"
/>
<Slider
Expand All @@ -133,6 +139,7 @@ export default function EffectsPanel({
step={1}
value={adjustments.vignetteRoundness}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.effects.vignette.roundness}
/>
<Slider
defaultValue={50}
Expand All @@ -143,6 +150,7 @@ export default function EffectsPanel({
step={1}
value={adjustments.vignetteFeather}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.effects.vignette.feather}
fillOrigin="min"
/>
</div>
Expand All @@ -161,6 +169,7 @@ export default function EffectsPanel({
step={1}
value={adjustments.grainAmount}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.effects.grain.amount}
/>
<Slider
defaultValue={25}
Expand All @@ -171,6 +180,7 @@ export default function EffectsPanel({
step={1}
value={adjustments.grainSize}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.effects.grain.size}
fillOrigin="min"
/>
<Slider
Expand All @@ -182,6 +192,7 @@ export default function EffectsPanel({
step={1}
value={adjustments.grainRoughness}
onDragStateChange={onDragStateChange}
data-tooltip={TOOLTIP_TEXT.effects.grain.roughness}
fillOrigin="min"
/>
</div>
Expand Down
12 changes: 12 additions & 0 deletions src/components/panel/SettingsPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -809,6 +809,18 @@ export default function SettingsPanel({
/>
</SettingItem>

<SettingItem
label="Tooltips"
description="Show helpful tooltips when hovering over complex adjustment sliders and controls."
>
<Switch
checked={appSettings?.enableTooltips ?? false}
id="tooltips-toggle"
label="Enable Tooltips"
onChange={(checked) => onSettingsChange({ ...appSettings, enableTooltips: checked })}
/>
</SettingItem>

<SettingItem label="Font" description="Change the application font.">
<Dropdown
onChange={(value: any) => onSettingsChange({ ...appSettings, fontFamily: value })}
Expand Down
1 change: 1 addition & 0 deletions src/components/ui/AppProperties.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ export interface AppSettings {
livePreviewQuality?: string;
enableAiTagging?: boolean;
enableExifReading?: boolean;
enableTooltips?: boolean;
filterCriteria?: FilterCriteria;
lastFolderState?: any;
pinnedFolders?: any;
Expand Down
11 changes: 9 additions & 2 deletions src/components/ui/GlobalTooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ interface TooltipData {
isAbove: boolean;
}

export default function GlobalTooltip() {
interface GlobalTooltipProps {
appSettings: { enableTooltips?: boolean } | null;
}

export default function GlobalTooltip({ appSettings }: GlobalTooltipProps) {
const [tooltip, setTooltip] = useState<TooltipData | null>(null);
const timerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
const targetRef = useRef<HTMLElement | null>(null);
Expand Down Expand Up @@ -83,6 +87,9 @@ export default function GlobalTooltip() {

if (!el.getAttribute('data-tooltip')) return;

// Check if tooltips are enabled
if (appSettings?.enableTooltips !== true) return;

targetRef.current = el;

timerRef.current = setTimeout(() => {
Expand Down Expand Up @@ -139,7 +146,7 @@ export default function GlobalTooltip() {
clearTimer();
stopWatch();
};
}, []);
}, [appSettings]);

return createPortal(
<AnimatePresence mode="wait">
Expand Down
Loading
Loading