Skip to content
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

feat(fixes unit entry): specify characters you want to reject from tera-input #4463

Merged
merged 12 commits into from
Aug 15, 2024
Merged

feat(fixes unit entry): specify characters you want to reject from tera-input #4463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
001b4d4
latex font
shawnyama Aug 13, 2024
1696d2e
Merge branch 'main' of https://github.com/DARPA-ASKEM/terarium
shawnyama Aug 13, 2024
cba2988
Merge branch 'main' of https://github.com/DARPA-ASKEM/terarium
shawnyama Aug 14, 2024
6498dca
specify characters to reject as a prop to tera-input-text
shawnyama Aug 14, 2024
f7b7e43
Merge branch 'main' into settle-unit-editing
shawnyama Aug 14, 2024
6d144e5
create regex pattern out of characters you dont want
shawnyama Aug 14, 2024
8c70ca7
not a part of this pr
shawnyama Aug 14, 2024
92c2dfb
Merge branch 'main' into settle-unit-editing
shawnyama Aug 14, 2024
77b0d4c
rm comments
shawnyama Aug 14, 2024
1146860
Merge branch 'settle-unit-editing' of https://github.com/DARPA-ASKEM/…
shawnyama Aug 14, 2024
571f5fd
rm focusout
shawnyama Aug 14, 2024
28112d1
Merge branch 'main' into settle-unit-editing
shawnyama Aug 15, 2024
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
9 changes: 2 additions & 7 deletions packages/client/hmi-client/src/components/model/model-parts/tera-model-part-entry.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,9 @@
v-else
label="Unit"
placeholder="Add a unit"
:characters-to-reject="[' ']"
:model-value="item.unitExpression ?? ''"
@update:model-value="
($event) => {
const value = $event.replace(/[\s.]+/g, '');
$emit('update-item', { key: 'unitExpression', value });
}
"
@focusout="($event) => ($event.target.value = $event.target.value.replace(/[\s.]+/g, ''))"
@update:model-value="$emit('update-item', { key: 'unitExpression', value: $event })"
/>
</template>
</span>
Expand Down
12 changes: 9 additions & 3 deletions packages/client/hmi-client/src/components/widgets/tera-input-text.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<script setup lang="ts">
import { numberToNist } from '@/utils/number';
import { isString, toNumber, isNaN } from 'lodash';
import { isString, toNumber, isNaN, isEmpty } from 'lodash';
import { CSSProperties, computed, onMounted, ref } from 'vue';

const props = defineProps<{
Expand All @@ -37,6 +37,7 @@ const props = defineProps<{
placeholder?: string;
autoWidth?: boolean;
autoFocus?: boolean;
charactersToReject?: string[];
}>();

const emit = defineEmits(['update:model-value', 'focusout', 'keyup', 'blur', 'focus', 'keypress']);
Expand Down Expand Up @@ -83,8 +84,13 @@ function formatValue(value: string | number | undefined) {

const updateValue = (event: Event) => {
const target = event.target as HTMLInputElement;
const value = target.value;
emit('update:model-value', value);
if (props.charactersToReject && !isEmpty(props.charactersToReject)) {
shawnyama marked this conversation as resolved.
Show resolved Hide resolved
const start = target.selectionStart;
const end = target.selectionEnd;
target.value = target.value.replace(new RegExp(`[${props.charactersToReject.join('')}]`, 'g'), ''); // Create a regex pattern from charactersToReject to remove them
target.setSelectionRange(start, end); // Maintain cursor position, is needed if we are entering in the middle of the input
}
emit('update:model-value', target.value);
};

const onFocus = (event) => {
Expand Down
Loading