Skip to content
This repository has been archived by the owner on Feb 28, 2023. It is now read-only.

MODUL-1106: Modifier l'affichage de la vue mois du datepicker #1057

Merged
merged 20 commits into from
Jul 10, 2019
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
77c8f2d
MODUL-1106 - Add view prop to datepicker
raphpare Jun 19, 2019
7d7be6d
MODUL-1106 - MAJ
raphpare Jun 20, 2019
bd73880
MODUL-1106 - Ajout de la structure de base pour l'ajout des années et…
Jun 21, 2019
0195be2
MODUL-1106 - Ajouter la vue yearsMonths au base-calendar
raphpare Jun 21, 2019
ce8b941
MODUL-1106 - Maj des strories
raphpare Jun 21, 2019
ac77254
/MODUL-1106_datepicker-months-view:
raphpare Jun 21, 2019
1d4872a
Merge branch 'develop' into feature/MODUL-1106_datepicker-months-view
raphpare Jun 26, 2019
6838346
MODUL-1106 - Intégration de la nouvelle vue mois
raphpare Jun 27, 2019
37ec350
MODUL-1106 - modul-date accept years-months
raphpare Jul 2, 2019
17d916d
MODUL-1106 - Add event yearMonthSelect()
raphpare Jul 2, 2019
58ecd8d
Merge branch 'develop' into feature/MODUL-1106_datepicker-months-view
raphpare Jul 2, 2019
d2e57f3
MODUL-1106 - MAJ tests
raphpare Jul 4, 2019
edb2217
MODUL-1106 - MAJ des test unitaires
raphpare Jul 4, 2019
dbe7c2f
MODUL-1106 - Ajouter stories pour prop initialView
raphpare Jul 4, 2019
ee14e05
/MODUL-1106_datepicker-months-view: Auto stash before rebase of "orig…
raphpare Jul 4, 2019
95c42c4
Merge branch 'develop' into feature/MODUL-1106_datepicker-months-view
raphpare Jul 4, 2019
067fe52
MODUL-1106 - Ajout d'un storybook pour la date de naissance
jipigi Jul 5, 2019
6e13106
Merge branch 'develop' into feature/MODUL-1106_datepicker-months-view
raphpare Jul 9, 2019
2b6a886
MODUL-1106 - Revue de code
raphpare Jul 9, 2019
78345d4
MODUL-1106 - Revue de code
raphpare Jul 9, 2019
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
1 change: 0 additions & 1 deletion src/components/accordion-group/accordion-group.stories.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ Vue.use(AccordionGroupPlugin);


storiesOf(`${componentsHierarchyRootSeparator}${ACCORDION_GROUP_NAME}`, module)

.add('default', () => ({
props: {
text: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ export abstract class MAbstractCalendarRenderer extends ModulVue {
onYearSelect(year: YearState): void {
}

@Emit(CalendarEvent.YEAR_MONTH_SELECT)
onYearMonthSelect(year: YearState, month: MonthState): void {
}

@Emit(CalendarEvent.YEAR_NEXT)
onYearNext(event: Event): void {
}
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,83 +1,92 @@
<div :id="id"
class="m-base-calendar"
:class="{'m--is-picker-mode-year': isPickerModeYear}">
:class="{'m--is-years-months-view': isYearsMonthsView,
'm--is-max-row': isMaxRow}">
<nav class="m-base-calendar__header"
:class="{'m--is-select-mode': !isPickerModeDay}">
<m-link class="m-base-calendar__current-month-and-year"
:class="{'m--is-select-mode': !isDaysView}">
<strong v-if="isButtonToogleViewDisabled">{{ currentMonthName }} {{ currentYear }}</strong>
<m-link v-else
class="m-base-calendar__current-month-and-year"
:mode="modeLinkCurrentMonthAndYear"
@click.stop="onYearClick"
@click.stop="onToogleView"
aria-live="polite"
ref="currentDate">{{ currentMonthName }} {{ currentYear }}</m-link>
<div v-if="isPickerModeDay"
class="m-base-calendar__nav-buttons">
<m-icon-button class="m-base-calendar__previous"
@click.stop="onMonthPrevious()"
:disabled="isMinMonth"
icon-name="m-svg__chevron--left"
ref="previousMonth"
skin="link">{{ previousMonthLabel }}</m-icon-button>
<m-icon-button class="m-base-calendar__next"
@click.stop="onMonthNext()"
:disabled="isMaxMonth"
icon-name="m-svg__chevron--right"
ref="nextMonth"
skin="link">{{ nextMonthLabel }}</m-icon-button>
</div>
<transition name="m--is">
<div v-if="isDaysView"
class="m-base-calendar__nav-buttons">
<m-icon-button class="m-base-calendar__previous"
@click.stop="onMonthPrevious()"
:disabled="isMinMonth"
icon-name="m-svg__chevron--left"
icon-size="16px"
ref="previousMonth"
skin="link">{{ previousMonthLabel }}</m-icon-button>
<m-icon-button class="m-base-calendar__next"
@click.stop="onMonthNext()"
:disabled="isMaxMonth"
icon-name="m-svg__chevron--right"
icon-size="16px"
ref="nextMonth"
skin="link">{{ nextMonthLabel }}</m-icon-button>
</div>
</transition>
</nav>
<div class="m-base-calendar__body"
:class="{'m--is-max-row': isMaxRow}"
aria-live="polite">

<div v-if="isPickerModeYear"
class="m-base-calendar__years">
<m-calendar-button v-for="(y, yearIndex) in years"
:key="yearIndex"
@click.stop="onYearSelect(y)"
@keyup.enter="onYearSelect(y)"
:selected="y.isCurrent"
:ref="buildRef('year', y)">{{ y.year }}</m-calendar-button>
</div>
<div v-if="isPickerModeMonth"
class="m-base-calendar__months">
<m-calendar-button v-for="(m, monthIndex) in months"
:key="monthIndex"
:disabled="m.isDisabled"
:selected="m.isCurrent"
@click.stop="onMonthSelect(m)"
@keyup.enter="onMonthSelect(m)"
:ref="buildRef('month', m)"
:tabindex="monthTabIndex(m)">{{ monthIndexToShortName(m.month) }}</m-calendar-button>
</div>
<template v-if="isPickerModeDay">
<div class="m-base-calendar__week">
<span v-for="(w, weekdayIndex) in weekdaysLabels"
:key="weekdayIndex"
class="m-base-calendar__weekday">{{ w }}</span>
</div>
<div class="m-base-calendar__days">
<m-calendar-button v-for="(d, dayIndex) in days"
:key="dayIndex"
class="m-base-calendar__day"
:class="{ 'm--is-highlighted': d.isHighlighted,
aria-live="polite"
ref="body">
<transition name="m--is">
<div v-if="isDaysView"
class="m-base-calendar__days-view">
<div class="m-base-calendar__week">
<span v-for="(w, weekdayIndex) in weekdaysLabels"
:key="weekdayIndex"
class="m-base-calendar__weekday">{{ w }}</span>
</div>
<div class="m-base-calendar__days-grid">
<m-calendar-button v-for="(d, dayIndex) in days"
:key="dayIndex"
class="m-base-calendar__day"
:class="{ 'm--is-highlighted': d.isHighlighted,
'm--is-in-future': isDateInFuture(d),
'm--is-inside-range': isInsideRange(d),
'm--is-other-month': d.isInPreviousMonth || d.isInNextMonth,
'm--is-selection-start': isSelectionStart(d),
'm--is-selection-end': isSelectionEnd(d)}"
:disabled="d.isDisabled || hideDay(d)"
:selected="d.isSelected"
:today="d.isToday"
@click.stop="onDaySelect(d)"
@keyup.enter="onDaySelect(d)"
@keyup.tab="onDaykeyboardTab(d)"
@mouseenter="onDayMouseEnter(d)"
@mouseleave="onDayMouseLeave(d)"
:ref="buildRef('day', d)"
:tabindex="dayTabIndex(d)">
<span class="m-base-calendar__day-content"
:class="{ 'm--is-hidden': hideDay(d) }">{{ d.day }}</span>
</m-calendar-button>
:disabled="d.isDisabled || hideDay(d)"
:selected="d.isSelected"
:today="d.isToday"
@click.stop="onDaySelect(d)"
@keyup.enter="onDaySelect(d)"
@keyup.tab="onDaykeyboardTab(d)"
@mouseenter="onDayMouseEnter(d)"
@mouseleave="onDayMouseLeave(d)"
:ref="buildRef('day', d)">
<span class="m-base-calendar__day-content"
:class="{ 'm--is-hidden': hideDay(d) }">{{ d.day }}</span>
</m-calendar-button>
</div>
</div>
</transition>
<transition name="m--is"
@enter="scrollToCurrentYear">
<div v-if="isYearsMonthsView"
class="m-base-calendar__years-months-view"
ref="yearsMonthsView">
<template v-for="(yM, yearsMonthsIndex) in yearsMonths">
<h2 class="m-base-calendar__year-title"
:class="{'m--is-current': yM.year.isCurrent}"
:data-current-year="yM.year.isCurrent">{{yM.year.year}}</h2>
<div class="m-base-calendar__month-list">
<m-calendar-button v-for="(m, monthIndex) in yM.months"
:key="monthIndex"
:disabled="m.isDisabled"
@click.stop="onYearMonthSelect(yM.year, m)"
@keyup.enter="onYearMonthSelect(yM.year.year, m)"
:selected="m.isCurrent"
:ref="buildRef('month', m)">{{ monthIndexToShortName(m.month) }}</m-calendar-button>
</div>
</template>
</div>
</template>
</transition>
</div>
</div>
Loading