-
Notifications
You must be signed in to change notification settings - Fork 354
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
Refactor form components #659
Merged
Merged
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
5b4370a
Add Barcode Input Component and Integrate Quagga for Scanning
chiragchhatrala 551cf80
Update Barcode scanner UI
chiragchhatrala c45bbeb
Barcode decoder as user selection
chiragchhatrala 7920389
Merge branch 'main' into 588bb-barcode-reader
chiragchhatrala 3f9cc7c
improve barcode
chiragchhatrala e555e4e
Refactor form components and update Tailwind configuration
chiragchhatrala 23d9f82
Merge branch 'main' into refactor-form-components
JhumanJ 34ff62d
Merge branch 'main' into refactor-form-components
JhumanJ 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,171 @@ | ||
| <template> | ||
| <input-wrapper v-bind="inputWrapperProps"> | ||
| <template #label> | ||
| <slot name="label" /> | ||
| </template> | ||
|
|
||
| <div | ||
| v-if="isScanning" | ||
| class="relative w-full" | ||
| > | ||
| <CameraUpload | ||
| :is-barcode-mode="true" | ||
| :decoders="decoders" | ||
| @stop-webcam="stopScanning" | ||
| @barcode-detected="handleBarcodeDetected" | ||
| /> | ||
| </div> | ||
|
|
||
| <div | ||
| v-else-if="scannedValue" | ||
| class="flex items-center justify-between border border-gray-300 dark:border-gray-600 w-full bg-white text-gray-700 dark:bg-notion-dark-light dark:text-gray-300 rounded-lg px-4 py-2" | ||
| > | ||
| <div class="flex-1 break-all"> | ||
| {{ scannedValue }} | ||
| </div> | ||
| <button | ||
| v-if="!disabled" | ||
| type="button" | ||
| class="pt-1 text-gray-400 hover:text-gray-600" | ||
| @click="clearValue" | ||
| > | ||
| <Icon | ||
| name="i-heroicons-x-mark-20-solid" | ||
| class="h-5 w-5" | ||
| /> | ||
| </button> | ||
| </div> | ||
|
|
||
| <div | ||
| v-else | ||
| :style="inputStyle" | ||
| class="flex flex-col w-full items-center justify-center transition-colors duration-40" | ||
| :class="[ | ||
| {'!cursor-not-allowed':disabled, 'cursor-pointer':!disabled}, | ||
| theme.fileInput.input, | ||
| theme.fileInput.borderRadius, | ||
| theme.fileInput.spacing.horizontal, | ||
| theme.fileInput.spacing.vertical, | ||
| theme.fileInput.fontSize, | ||
| theme.fileInput.minHeight, | ||
| {'border-red-500 border-2':hasError}, | ||
| 'focus:outline-none focus:ring-2' | ||
| ]" | ||
| tabindex="0" | ||
| role="button" | ||
| aria-label="Click to open a camera" | ||
| @click="startScanning" | ||
| @keydown.enter.prevent="startScanning" | ||
| > | ||
| <div class="flex w-full items-center justify-center"> | ||
| <div class="text-center"> | ||
| <template v-if="!scannedValue && !isScanning"> | ||
| <div class="text-gray-500 w-full flex justify-center"> | ||
| <svg | ||
| xmlns="http://www.w3.org/2000/svg" | ||
| fill="none" | ||
| viewBox="0 0 24 24" | ||
| stroke-width="1.5" | ||
| stroke="currentColor" | ||
| class="w-5 h-5" | ||
| > | ||
| <path | ||
| stroke-linecap="round" | ||
| stroke-linejoin="round" | ||
| d="M3 16.5v2.25A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75V16.5m-13.5-9L12 3m0 0l4.5 4.5M12 3v13.5" | ||
| /> | ||
| </svg> | ||
| </div> | ||
|
|
||
| <p class="mt-2 text-sm text-gray-500 font-medium select-none"> | ||
| {{ $t('forms.barcodeInput.clickToOpenCamera') }} | ||
| </p> | ||
| <div class="w-full items-center justify-center mt-2 hidden sm:flex"> | ||
| <UButton | ||
| icon="i-heroicons-camera" | ||
| color="white" | ||
| class="px-2" | ||
| @click.stop="startScanning" | ||
| /> | ||
| </div> | ||
| </template> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <template #error> | ||
| <slot name="error" /> | ||
| </template> | ||
| </input-wrapper> | ||
| </template> | ||
|
|
||
| <script> | ||
| import { inputProps, useFormInput } from './useFormInput.js' | ||
| import InputWrapper from './components/InputWrapper.vue' | ||
| import CameraUpload from './components/CameraUpload.vue' | ||
|
|
||
| export default { | ||
| name: 'BarcodeInput', | ||
| components: { InputWrapper, CameraUpload }, | ||
|
|
||
| props: { | ||
| ...inputProps, | ||
| decoders: { | ||
| type: Array, | ||
| default: () => [] | ||
| } | ||
| }, | ||
|
|
||
| setup(props, context) { | ||
| return { | ||
| ...useFormInput(props, context), | ||
| } | ||
| }, | ||
|
|
||
| data: () => ({ | ||
| isScanning: false, | ||
| scannedValue: null | ||
| }), | ||
|
|
||
| watch: { | ||
| scannedValue: { | ||
| handler(value) { | ||
| this.compVal = value | ||
| }, | ||
| immediate: true | ||
| } | ||
| }, | ||
|
|
||
| beforeUnmount() { | ||
| this.stopScanning() | ||
| }, | ||
|
|
||
| methods: { | ||
| startScanning() { | ||
| if (this.disabled) return | ||
| this.isScanning = true | ||
| }, | ||
|
|
||
| stopScanning() { | ||
| this.isScanning = false | ||
| }, | ||
|
|
||
| handleBarcodeDetected(code) { | ||
| this.scannedValue = code | ||
| this.stopScanning() | ||
| }, | ||
|
|
||
| clearValue() { | ||
| this.scannedValue = null | ||
| } | ||
| } | ||
| } | ||
| </script> | ||
|
|
||
| <style scoped> | ||
| video { | ||
| /* Ensure the video displays properly */ | ||
| max-width: 100%; | ||
| height: auto; | ||
| } | ||
| </style> |
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
Oops, something went wrong.
Oops, something went wrong.
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.
🛠️ Refactor suggestion
Deeply merge Quill modules for reliability
Merging only the first level of
modulesobjects can lead to unexpected overwrites. Ifprops.editorOptions.modulescontains multiple nested objects (e.g.,syntax,clipboard), consider a deep merge to avoid losing default sub-options.