Skip to content

Commit

Permalink
prevent theatre UI css reset
Browse files Browse the repository at this point in the history
  • Loading branch information
clementroche committed Jan 20, 2025
1 parent 4408564 commit 6d0d8cb
Show file tree
Hide file tree
Showing 17 changed files with 33 additions and 28 deletions.
2 changes: 1 addition & 1 deletion app/(pages)/r3f/(components)/box/index.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client'

import { useRect } from '@darkroom.engineering/hamo'
import { useRect } from 'hamo'
import dynamic from 'next/dynamic'
import { WebGLTunnel } from '~/libs/webgl/components/tunnel'

Expand Down
2 changes: 1 addition & 1 deletion components/accordion/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use client'

import { useResizeObserver } from '@darkroom.engineering/hamo'
import cn from 'clsx'
import { useResizeObserver } from 'hamo'
import {
type Dispatch,
type HTMLAttributes,
Expand Down
2 changes: 1 addition & 1 deletion components/animated-gradient/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client'

import { useRect } from '@darkroom.engineering/hamo'
import { useRect } from 'hamo'
import dynamic from 'next/dynamic'
import type { CSSProperties, ComponentProps } from 'react'
import { WebGLTunnel } from '~/libs/webgl/components/tunnel'
Expand Down
6 changes: 1 addition & 5 deletions components/animated-gradient/webgl.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import {
type ExtendedDOMRect,
useObjectFit,
useWindowSize,
} from '@darkroom.engineering/hamo'
import { useFrame, useThree } from '@react-three/fiber'
import { type ExtendedDOMRect, useObjectFit, useWindowSize } from 'hamo'
import { useEffect, useMemo, useRef, useState } from 'react'
import { CanvasTexture, LinearFilter, type Mesh } from 'three'
import { useFlowmap } from '~/libs/webgl/components/flowmap'
Expand Down
2 changes: 1 addition & 1 deletion components/fold/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use client'

import { useRect, useWindowSize } from '@darkroom.engineering/hamo'
import cn from 'clsx'
import { useRect, useWindowSize } from 'hamo'
import {
type HTMLAttributes,
type ReactNode,
Expand Down
5 changes: 1 addition & 4 deletions components/marquee/index.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
'use client'

import {
useIntersectionObserver,
useResizeObserver,
} from '@darkroom.engineering/hamo'
import cn from 'clsx'
import { useIntersectionObserver, useResizeObserver } from 'hamo'
import { useLenis } from 'lenis/react'
import { type HTMLAttributes, useRef } from 'react'
import { useTempus } from 'tempus/react'
Expand Down
2 changes: 1 addition & 1 deletion components/progress-text/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use client'

import { useRect } from '@darkroom.engineering/hamo'
import cn from 'clsx'
import { useRect } from 'hamo'
import { type CSSProperties, Fragment, type ReactNode, useRef } from 'react'
import {
type UseScrollTriggerOptions,
Expand Down
2 changes: 1 addition & 1 deletion components/scrollbar/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client'

import { useRect } from '@darkroom.engineering/hamo'
import { useRect } from 'hamo'
import { useLenis } from 'lenis/react'
import { useEffect, useRef } from 'react'
import { mapRange } from '~/libs/maths'
Expand Down
2 changes: 1 addition & 1 deletion components/split-text/index.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use client'

import { useResizeObserver } from '@darkroom.engineering/hamo'
import cn from 'clsx'
import { gsap } from 'gsap'
import { SplitText as GSAPSplitText } from 'gsap/SplitText'
import { useResizeObserver } from 'hamo'
import {
type Ref,
useEffect,
Expand Down
2 changes: 1 addition & 1 deletion hooks/use-device-detection.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useMediaQuery } from '@darkroom.engineering/hamo'
import { useMediaQuery } from 'hamo'
import { breakpoints } from '~/styles/config.mjs'

interface NavigatorWithBattery extends Navigator {
Expand Down
6 changes: 1 addition & 5 deletions hooks/use-scroll-trigger.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
'use client'

import {
type Rect,
useLazyState,
useWindowSize,
} from '@darkroom.engineering/hamo'
import { type Rect, useLazyState, useWindowSize } from 'hamo'
import { useLenis } from 'lenis/react'
import { useCallback, useEffect, useRef } from 'react'
import { useTransform } from '~/hooks/use-transform'
Expand Down
2 changes: 1 addition & 1 deletion libs/orchestra/grid/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useWindowSize } from '@darkroom.engineering/hamo'
import cn from 'clsx'
import { useWindowSize } from 'hamo'
import { useMemo } from 'react'
import s from './grid.module.css'

Expand Down
2 changes: 1 addition & 1 deletion libs/orchestra/minimap/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client'

import { useWindowSize } from '@darkroom.engineering/hamo'
import { useWindowSize } from 'hamo'
import { useCallback, useEffect, useId, useRef, useState } from 'react'
import { useTempus } from 'tempus/react'
import { create } from 'zustand'
Expand Down
2 changes: 1 addition & 1 deletion libs/webgl/components/image/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useRect } from '@darkroom.engineering/hamo'
import { useRect } from 'hamo'
import dynamic from 'next/dynamic'
import { useState } from 'react'
import {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"typecheck": "tsc --noEmit --incremental false"
},
"dependencies": {
"@darkroom.engineering/hamo": "1.0.0-dev.4",
"@hubspot/api-client": "^12.0.1",
"@next/third-parties": "^15.1.3",
"@react-three/drei": "^9.120.5",
Expand All @@ -27,6 +26,7 @@
"babel-plugin-react-compiler": "19.0.0-beta-a7bf2bd-20241110",
"clsx": "^2.1.1",
"gsap": "^3.12.5",
"hamo": "1.0.0-dev.5",
"lenis": "1.1.20-dev.0",
"next": "15.1.3",
"postprocessing": "^6.36.6",
Expand Down
16 changes: 16 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions styles/_reset.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
svg,
video,
audio,
dialog,
vercel-live-feedback,
nextjs-portal,
dialog,
:where(select, option)
#theatrejs-studio-root, :where(select, option)
):not(svg *, symbol *)
) {
all: unset;
Expand Down

0 comments on commit 6d0d8cb

Please sign in to comment.