-
Notifications
You must be signed in to change notification settings - Fork 179
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Use native eyedropper API if available #11739
Merged
Merged
Changes from 14 commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
0d05a96
initial setup
timarney ea3a877
use getSolidFromHex
timarney 681fe94
lint
timarney 8c4ec8d
karma test updates
timarney 8565225
use await
timarney 971ac15
lint
timarney f1fa74d
force test to run against htmlToImage
timarney 72717cf
fix &&
timarney af183bb
default to null
timarney 754904d
update callback
timarney 0a41e67
lint
timarney df13241
re-factor to single hook
timarney e4e802d
update to use eye dropper active
timarney 0011009
add default params
timarney 3332f84
remove extra conditional
timarney a155bb7
early return
timarney 6b53b6f
Merge branch 'main' into try/9478-eye-dropper
timarney File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 52 additions & 0 deletions
52
packages/story-editor/src/components/eyedropper/useEyeDropperApi.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,52 @@ | ||
/* | ||
* Copyright 2022 Google LLC | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
/** | ||
* External dependencies | ||
*/ | ||
import { useEffect, useCallback, useRef } from 'react'; | ||
import { getSolidFromHex } from '@googleforcreators/patterns'; | ||
import { noop } from '@googleforcreators/design-system'; | ||
|
||
function useEyeDropperApi({ onChange = noop, handleClose = noop }) { | ||
const isEyeDropperApiSupported = | ||
typeof window !== 'undefined' && 'EyeDropper' in window; | ||
const eyeDropper = useRef(null); | ||
|
||
useEffect(() => { | ||
if (isEyeDropperApiSupported && !eyeDropper.current) { | ||
eyeDropper.current = new window.EyeDropper(); | ||
} | ||
}, [isEyeDropperApiSupported]); | ||
|
||
const openEyeDropper = useCallback(async () => { | ||
if (!eyeDropper.current || !isEyeDropperApiSupported) { | ||
return; | ||
} | ||
|
||
try { | ||
const { sRGBHex } = await eyeDropper.current.open(); | ||
onChange(getSolidFromHex(sRGBHex.substring(1)).color); | ||
handleClose(); | ||
} catch (e) { | ||
//eslint-disable-next-line no-console -- Surface error for debugging. | ||
console.log(e.message); | ||
} | ||
}, [eyeDropper, isEyeDropperApiSupported, onChange, handleClose]); | ||
|
||
return { isEyeDropperApiSupported, openEyeDropper }; | ||
} | ||
|
||
export default useEyeDropperApi; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Surely these can be combined into one condition?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
3332f84
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: We can even do an early return if
isEyeDropperApiSupported
istrue
like suggested here and skip this part,eyedropperLayer
is not needed at all if we have the native API.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated:
a155bb7