diff --git a/.gitignore b/.gitignore index a180129b..eb91e361 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ node_modules .cache dist -.next \ No newline at end of file +.next +tsconfig.tsbuildinfo \ No newline at end of file diff --git a/package.json b/package.json index ae927b3f..c6ca970e 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "4.6.3", + "version": "4.6.4", "license": "MIT", "main": "dist/index.js", "typings": "dist/index.d.ts", @@ -23,10 +23,11 @@ }, "scripts": { "start": "tsdx watch", - "build": "node ./scripts/prepare.js && tsdx build && node ./scripts/copyData.js", + "build": "node ./scripts/prepare.js && yarn type-check && tsdx build --transpileOnly && node ./scripts/copyData.js", + "type-check": "tsc --noEmit --incremental --pretty --project tsconfig.json", "test": "tsdx test --passWithNoTests", "lint": "eslint ./src --ext .ts,.tsx", - "prepare": "tsdx build", + "prepare": "yarn type-check && tsdx build --transpileOnly", "size": "size-limit", "analyze": "size-limit --why", "storybook": "start-storybook -p 6006", @@ -98,6 +99,6 @@ "typescript": "^4.7.4" }, "dependencies": { - "flairup": "0.0.12" + "flairup": "0.0.15" } } diff --git a/src/components/header/Header.css b/src/components/header/Header.css deleted file mode 100644 index b60e4422..00000000 --- a/src/components/header/Header.css +++ /dev/null @@ -1,4 +0,0 @@ -.EmojiPickerReact .epr-header .epr-header-overlay { - padding: var(--epr-header-padding); - z-index: var(--epr-header-overlay-z-index); -} diff --git a/src/components/header/Header.tsx b/src/components/header/Header.tsx index f1a98044..e5257c21 100644 --- a/src/components/header/Header.tsx +++ b/src/components/header/Header.tsx @@ -3,7 +3,6 @@ import * as React from 'react'; import Relative from '../Layout/Relative'; import { CategoryNavigation } from '../navigation/CategoryNavigation'; -import './Header.css'; import { SearchContainer } from './Search'; export function Header() { diff --git a/src/components/header/Search.tsx b/src/components/header/Search.tsx index 22740a7c..dc6658d1 100644 --- a/src/components/header/Search.tsx +++ b/src/components/header/Search.tsx @@ -2,6 +2,7 @@ import { cx } from 'flairup'; import * as React from 'react'; import { useState } from 'react'; +import { stylesheet } from '../../Stylesheet/stylesheet'; import { useAutoFocusSearchConfig, useSearchDisabledConfig, @@ -29,7 +30,7 @@ export function SearchContainer() { } return ( - + {isSkinToneInSearch ? : null} @@ -37,6 +38,13 @@ export function SearchContainer() { ); } +const styles = stylesheet.create({ + overlay: { + padding: 'var(--epr-header-padding)', + zIndex: 'var(--epr-header-overlay-z-index)' + } +}); + export function Search() { const [inc, setInc] = useState(0); const closeAllOpenToggles = useCloseAllOpenToggles(); diff --git a/yarn.lock b/yarn.lock index 023bbb66..63a33e98 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6855,10 +6855,10 @@ find-up@^5.0.0: locate-path "^6.0.0" path-exists "^4.0.0" -flairup@0.0.12: - version "0.0.12" - resolved "https://registry.yarnpkg.com/flairup/-/flairup-0.0.12.tgz#e21c83dbe48cca02d0904c4387ccbd31ef248ac5" - integrity sha512-4u94jPcBLml3d58QLkoLiNqn6O016OQxHxx5ON4IU0eC+A3/QSlAxrw3EB/6FshWzxITNQ5Lrs8j619b/W1eRg== +flairup@0.0.15: + version "0.0.15" + resolved "https://registry.yarnpkg.com/flairup/-/flairup-0.0.15.tgz#75021bd21ae5780aad9fc24de90bab233e9899e6" + integrity sha512-1NWcJOmBF5MQyyVDj3KKT5nABmoZeIXGuYLhiFBZDNvemrsx2uc8ABM45mQX4MvGFWrWN0RVVjSMfTD3ZzQ3Lg== flat-cache@^2.0.1: version "2.0.1"