Skip to content

Commit f24474a

Browse files
committed
Merge branch 'develop'
2 parents e40a8f1 + 933e6bd commit f24474a

4 files changed

Lines changed: 9 additions & 8 deletions

File tree

src/components/outils/TransportSimulator.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ const TransportSimulator = () => {
3737

3838
useEffect(() => {
3939
if (selected === 'distance') {
40-
setHideActions(false)
40+
setHideActions('')
4141
} else {
42-
setHideActions(!start || !end)
42+
setHideActions(!start || !end ? 'transport' : '')
4343
}
4444
}, [selected, start, end])
4545

src/components/outils/livraison/Progress.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,9 @@ const Progress = ({
3939

4040
useEffect(() => {
4141
if (progress > 99) {
42-
console.log('progress > 99', length)
4342
clearTimeout(displayedTimeoutRef.current)
4443
setFadeIn(true)
4544
fadeInTimeoutRef.current = setTimeout(() => {
46-
console.log('timeout', length)
4745
setFadeIn(false)
4846
setToDisplay((value) => (value + 1) % length)
4947
setProgress(0)

src/components/shareable/Shareable.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,10 @@ const Shareable = ({
167167
</div>
168168
{secondary === undefined && (
169169
<>
170-
{showButtons && !hideActions && overScreens && ('hypothesis' in overScreens || 'data' in overScreens) ? (
170+
{showButtons &&
171+
hideActions !== slug &&
172+
overScreens &&
173+
('hypothesis' in overScreens || 'data' in overScreens) ? (
171174
<div className={classNames('no-screenshot', styles.ressources)}>
172175
{'data' in overScreens && (
173176
<Feature

src/providers/ParamProvider.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ const getFloat = (query: ReadonlyURLSearchParams, key: string) => {
6868
}
6969

7070
export type Params = {
71-
hideActions: boolean
72-
setHideActions: Dispatch<SetStateAction<boolean>>
71+
hideActions: string
72+
setHideActions: Dispatch<SetStateAction<string>>
7373
overscreen: Record<string, string>
7474
setOverscreen: (slug: string, value: string) => void
7575
theme: string
@@ -204,7 +204,7 @@ export function ParamProvider({ children }: { children: ReactNode }) {
204204
const [theme, setTheme] = useState(initialTheme.theme)
205205
const [language, setLanguage] = useState<SiteLanguage>('fr')
206206

207-
const [hideActions, setHideActions] = useState(false)
207+
const [hideActions, setHideActions] = useState('')
208208

209209
const [overscreen, setOverscreen] = useState<Record<string, string>>({})
210210
const overscreenTrigger = useRef<HTMLElement | null>(null)

0 commit comments

Comments
 (0)