Skip to content

Compact input #310

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.

Sign up for GitHub

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

Open
DuyenPay wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Compact input #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
827c249
init
DuyenPay Dec 31, 2019
3411a2a
Merge branch 'master' of https://github.com/gigasource/pos-vue-framew…
DuyenPay Dec 31, 2019
6d91c33
lite input
DuyenPay Dec 31, 2019
d6b09fb
lite input
DuyenPay Dec 31, 2019
21af68f
make textfield transparent wrapper
DuyenPay Dec 31, 2019
7f07f86
label conditional rendered
DuyenPay Dec 31, 2019
c92715b
remove wrapper in lite tf
DuyenPay Jan 2, 2020
ab5210b
remove wrapper in lite tf
DuyenPay Jan 2, 2020
db50a38
remove wrapper in lite tf
DuyenPay Jan 2, 2020
74a33c4
conditionally render part of full tf
DuyenPay Jan 14, 2020
406ef4e
fix lite to only has inner parts
DuyenPay Jan 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 0 additions & 79 deletions src/components/GInput/GInput.js
View file
Open in desktop

This file was deleted.

85 changes: 64 additions & 21 deletions src/components/GInput/GInputFactory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
export function getLabel(context, props, internalValue, isValidInput, isFocused,
labelActiveClass = 'g-tf-label__active') {
[labelActiveClass] = 'g-tf-label__active') {
const tfType = computed(() => {
if (context.slots['prepend-outer'] || props.prependIcon || props.outlined) return 'full'
return 'lite'
})
//Activate label
const isDirty = computed(() => !!internalValue.value)
const isDirty = computed(() => !!internalValue.value || internalValue.value === 0)
const isLabelActive = computed(() => {
const datetimeInputTypes = ['date', 'datetime', 'datetime-local', 'month', 'time', 'week']

Expand All @@ -22,6 +26,19 @@ export function getLabel(context, props, internalValue, isValidInput, isFocused,
const prefixWidth = reactive({
value: 0
})
const prependRef = ref(null)
const prependWidth = ref(0)
// const prependWidth = computed(() => {
// let i = props.filled
// console.log(prependRef.value && prependRef.value.offsetWidth)
// return prependRef.value && prependRef.value.offsetWidth
// })
watch([() => prependRef.value, () => props.filled], () => {
context.root.$nextTick(() => {
prependWidth.value = prependRef.value && prependRef.value.offsetWidth
})
})


watch(() => props.prefix, () => {
context.root.$nextTick(() => {
Expand All @@ -30,29 +47,55 @@ export function getLabel(context, props, internalValue, isValidInput, isFocused,
})

const labelStyles = computed(() => {
if (isLabelActive.value && prefixWidth.value) {
if (props.outlined) {
if (props.filled) {
if (props.rounded) return {'transform': `translateY(-28px) translateX(${-prefixWidth.value}px) scale(0.75)`}
return {'transform': `translateY(-${props.dense ? 26 : 28}px) translateX(${-prefixWidth.value - 6}px) scale(0.75)`}
if (tfType.value === 'full') {
if (isLabelActive.value && prefixWidth.value) {
if (props.outlined) {
if (props.filled) {
if (props.rounded) return { 'transform': `translateY(-28px) translateX(${-prefixWidth.value}px) scale(0.75)` }
return { 'transform': `translateY(-${props.dense ? 26 : 28}px) translateX(${-prefixWidth.value - 6}px) scale(0.75)` }
} else {
return { 'transform': `translateY(-${props.dense ? 22 : 26}px) translateX(${-prefixWidth.value + 6}px) scale(0.75)` }
}
} else if (props.filled) {
return { 'transform': `translateY(-${props.dense ? 12 : 16}px) translateX(${-prefixWidth.value - 6}px) scale(0.75)` }
} else {
return {'transform': `translateY(-${props.dense ? 22 : 26}px) translateX(${-prefixWidth.value + 6}px) scale(0.75)`}
return { 'transform': `translateY(-${props.dense ? 12 : 16}px) translateX(${-prefixWidth.value + 6}px) scale(0.75)` }
}
} else if (props.filled) {
return {'transform': `translateY(-${props.dense ? 12 : 16}px) translateX(${-prefixWidth.value - 6}px) scale(0.75)`}
} else {
return {'transform': `translateY(-${props.dense ? 12 : 16}px) translateX(${-prefixWidth.value + 6}px) scale(0.75)`}
}
} else {
if (!isLabelActive.value && (prependWidth.value || prefixWidth.value)) {
if(props.filled) {
if(props.rounded || props.shaped ) return { 'padding-left': `${prependWidth.value + prefixWidth.value -5}px` }
return { 'padding-left': `${prependWidth.value + prefixWidth.value}px` }}
return { 'padding-left': `${prependWidth.value + prefixWidth.value -1}px` }
}
if (isLabelActive.value && (prependWidth.value || prefixWidth.value)) {
if (!prefixWidth.value) {
if(props.filled) {
if(props.rounded||props.shaped)return { 'transform': `translateY(-${props.dense ? 12 : 16}px) translateX(${prependWidth.value- 5}px) scale(0.75)` }
return { 'transform': `translateY(-${props.dense ? 12 : 16}px) translateX(${prependWidth.value}px) scale(0.75)` }}
return { 'transform': `translateY(-${props.dense ? 12 : 16}px) translateX(${prependWidth.value}px) scale(0.75)` }
}
else {
if (props.filled) {
if (props.rounded) return { 'transform': `translateY(-${props.dense ? 12 : 16}px) translateX(${prependWidth.value - 4}px) scale(0.75)` }
if (props.shaped) return { 'transform': `translateY(-${props.dense ? 12 : 16}px) translateX(${prependWidth.value - 10}px) scale(0.75)` }
return { 'transform': `translateY(-${props.dense ? 12 : 16}px) translateX(${prependWidth.value -6}px) scale(0.75)` }
}
return { 'transform': `translateY(-${props.dense ? 12 : 16}px) translateX(${prependWidth.value + 6}px) scale(0.75)` }
}
}

}
})

return {labelClasses, labelStyles, isDirty, isLabelActive, prefixRef}
return { labelClasses, labelStyles, isDirty, isLabelActive, prefixRef, prependRef }
}

import {computed, reactive, ref, watch} from '@vue/composition-api';
import { computed, reactive, ref, watch } from '@vue/composition-api';


import {convertToUnit, keyCodes} from '../../utils/helpers';
import { convertToUnit, keyCodes } from '../../utils/helpers';

export function getValidate(props, isFocused, internalValue, isValidInput, customAlert) {
//Validation
Expand Down Expand Up @@ -92,9 +135,9 @@ export function getValidate(props, isFocused, internalValue, isValidInput, custo
isValidInput.value = true
}

}, !props.value ? {lazy: true} : null)
}, !props.value ? { lazy: true } : null)

return {errorMessages, validate};
return { errorMessages, validate };
}

export function getSlotEventListeners(context) {
Expand Down Expand Up @@ -185,14 +228,14 @@ export function getEvents(props, context, internalValue, isFocused, isValidInput
}
}

return {onClick, onFocus, onBlur, onClearIconClick, onMouseDown, onMouseUp, onChange, onKeyDown}
return { onClick, onFocus, onBlur, onClearIconClick, onMouseDown, onMouseUp, onChange, onKeyDown }
}

export function getInternalValue(props, context) {
// text field internalValue
const rawInternalValue = ref(props.value || '');
const rawInternalValue = ref((props.value || props.value === 0) ? props.value : '');

watch(() => props.value, () => rawInternalValue.value = props.value, {lazy: true});
watch(() => props.value, () => rawInternalValue.value = props.value, { lazy: true });

const internalValue = computed({

Expand All @@ -203,5 +246,5 @@ export function getInternalValue(props, context) {
}
});

return {internalValue, rawInternalValue};
return { internalValue, rawInternalValue };
}
Loading