Skip to content

fix(NcDateTimePickerNative): visual fixes #6454

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

Merged
susnux merged 3 commits into from
Jan 29, 2025
Merged

fix(NcDateTimePickerNative): visual fixes #6454

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f23681f
fix(NcDateTimePickerNative): make 'id' non-required prop, generate de…
Antreesy Jan 24, 2025
d3f8232
fix(NcDateTimePickerNative): align styles with other input elements
Antreesy Jan 24, 2025
b0e6483
docs(NcDateTimePickerNative): remove duplicated examples
Antreesy Jan 24, 2025
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
115 changes: 29 additions & 86 deletions src/components/NcDateTimePickerNative/NcDateTimePickerNative.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
<NcSelect v-bind="props" v-model="type" />
<NcDateTimePickerNative
v-model="value"
:id="id"
:label="label"
:type="type" />
</div>
Expand All @@ -45,7 +44,6 @@
},
type: 'datetime-local',
value: new Date(),
id: 'date-time-picker',
label: 'Select a new date or time',
}
},
Expand All @@ -66,7 +64,6 @@
<span>Picked date: {{ value || 'null' }}</span>
<NcDateTimePickerNative
v-model="value"
:id="id"
:min="yesterdayDate"
:max="someDate"
:label="label"
Expand All @@ -79,7 +76,6 @@
data() {
return {
value: new Date(),
id: 'date-time-picker',
label: 'please select a new date',
yesterdayDate: new Date(new Date().setDate(new Date().getDate() - 1)),
someDate: new Date(new Date().setDate(new Date().getDate() + 7)),
Expand All @@ -88,90 +84,15 @@
}
</script>
```

#### Usage: type='time'
```vue
<template>
<div>
<span>Picked time: {{ value || 'null' }}</span>
<NcDateTimePickerNative
v-model="value"
:id="id"
:label="label"
type="time" />
</div>
</template>

<script>
export default {
data() {
return {
value: new Date(),
id: 'date-time-picker',
label: 'Please select a new time',
}
},
}
</script>
```

#### Usage: type='week'
```vue
<template>
<div>
<span>Picked date: {{ value || 'null' }}</span>
<NcDateTimePickerNative
v-model="value"
:id="id"
:label="label"
type="week" />
</div>
</template>

<script>
export default {
data() {
return {
value: new Date(),
id: 'date-time-picker',
label: 'please select a new date',
}
},
}
</script>
```

#### Usage: type='month'
```vue
<template>
<div>
<span>Picked date: {{ value || 'null' }}</span>
<NcDateTimePickerNative
v-model="value"
:id="id"
:label="label"
type="month" />
</div>
</template>

<script>
export default {
data() {
return {
value: new Date(),
id: 'date-time-picker',
label: 'please select a new date',
}
},
}
</script>
```

</docs>

<template>
<div class="native-datetime-picker">
<label :class="{ 'hidden-visually': hideLabel }" :for="id">{{ label }}</label>
<label class="native-datetime-picker--label"
:class="{ 'hidden-visually': hideLabel }"
:for="id">
{{ label }}
</label>
<input :id="id"
class="native-datetime-picker--input"
:class="inputClass"
Expand All @@ -186,6 +107,7 @@

<script>
import { useModelMigration } from '../../composables/useModelMigration.ts'
import GenRandomId from '../../utils/GenRandomId.js'

const inputDateTypes = ['date', 'datetime-local', 'month', 'time', 'week']

Expand Down Expand Up @@ -224,7 +146,8 @@
*/
id: {
type: String,
required: true,
default: () => 'date-time-picker-' + GenRandomId(),
validator: id => id.trim() !== '',
},
/**
* type attribute of the input field
Expand Down Expand Up @@ -321,7 +244,7 @@
listeners() {
return {
...this.$listeners,
/**

Check warning on line 247 in src/components/NcDateTimePickerNative/NcDateTimePickerNative.vue

View workflow job for this annotation

GitHub Actions / NPM lint 

JSDoc @return declaration present but return expression not available in function
* Handle the input event
*
* @param {InputEvent} $event input event payload
Expand Down Expand Up @@ -420,10 +343,30 @@
flex-direction: column;
}

.native-datetime-picker .native-datetime-picker--label {
margin-block-end: 2px;
}

.native-datetime-picker .native-datetime-picker--input {
// If border width differs between focused and unfocused we need to compensate to prevent jumping
--input-border-width-offset: calc(var(--border-width-input-focused, 2px) - var(--border-width-input, 2px));
width: 100%;
flex: 0 0 auto;
padding-right: 4px;
margin: 0;
padding-inline-start: calc(var(--border-radius-large) + var(--input-border-width-offset));
padding-inline-end: calc(var(--default-grid-baseline) + var(--input-border-width-offset));
border: var(--border-width-input, 2px) solid var(--color-border-maxcontrast);

&:active:not([disabled]),
&:hover:not([disabled]),
&:focus:not([disabled]),
&:focus-within:not([disabled]) {
border-color: var(--color-main-text);
border-width: var(--border-width-input-focused, 2px);
box-shadow: 0 0 0 2px var(--color-main-background) !important;
// Reset padding offset when focused
--input-border-width-offset: 0px;
}
}

[data-theme-light],
Expand Down
Loading