Merge branch 'next' into feat/radio-a11y

Trendyol · Jan 8, 2025 · 457fba2 · 457fba2
2 parents e3aaa7f + 33dd9a4
commit 457fba2
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 6 deletions.
diff --git a/src/components/calendar/bl-calendar.test.ts b/src/components/calendar/bl-calendar.test.ts
@@ -534,7 +534,7 @@ describe("bl-calendar", () => {
 
     const setNextCalendarViewSpy = sinon.spy(element, "setNextCalendarView");
 
-    element.handleDate(new Date(2024, 2, 15));
+    element.handleDate(new Date(element.today.getFullYear()+1,2,15));
 
     expect(setNextCalendarViewSpy).to.have.been.called;
 

diff --git a/src/components/datepicker/bl-datepicker.test.ts b/src/components/datepicker/bl-datepicker.test.ts
@@ -1,4 +1,4 @@
-import { aTimeout, expect, fixture, html } from "@open-wc/testing";
+import { aTimeout, elementUpdated, expect, fixture, html } from "@open-wc/testing";
 import { BlButton, BlDatePicker } from "../../baklava";
 import { CALENDAR_TYPES } from "../calendar/bl-calendar.constant";
 import sinon from "sinon";
@@ -95,11 +95,20 @@ describe("BlDatepicker", () => {
     element._selectedDates = [new Date(2023, 1, 1)];
     await element.updateComplete;
 
+    element.addEventListener("bl-datepicker-change", (event) => {
+      const customEvent = event as CustomEvent;
+
+      expect(customEvent).to.exist;
+      expect(customEvent.detail).to.deep.equal([]);
+
+    });
+
     const clearButton = element.shadowRoot?.querySelector("bl-button") as BlButton;
 
     clearButton?.click();
     await element.updateComplete;
 
+
     expect(element._selectedDates).to.deep.equal([]);
     expect(element._inputValue).to.equal("");
   });
@@ -376,4 +385,13 @@ describe("BlDatepicker", () => {
     expect(focusSpy.called).to.be.true;
   });
 
+  it("should call setDatePickerInput when _selectedDates changes", async () => {
+    const setDatePickerInputSpy = sinon.spy(element, "setDatePickerInput");
+
+    element.value = [new Date(2025,0,10)];
+    await elementUpdated(element);
+
+    expect(setDatePickerInputSpy).to.have.been.calledOnceWith(element._selectedDates);
+  });
+
 });
diff --git a/src/components/datepicker/bl-datepicker.ts b/src/components/datepicker/bl-datepicker.ts
@@ -1,4 +1,4 @@
-import { CSSResultGroup, html, TemplateResult } from "lit";
+import { CSSResultGroup, html, PropertyValues, TemplateResult } from "lit";
 import { customElement, property, query, state } from "lit/decorators.js";
 import { BlCalendar, BlPopover } from "../../baklava";
 import DatepickerCalendarMixin from "../../mixins/datepicker-calendar-mixin/datepicker-calendar-mixin";
@@ -147,10 +147,10 @@ export default class BlDatepicker extends DatepickerCalendarMixin {
   }
 
   clearDatepicker() {
-    this._calendarEl.handleClearSelectedDates();
     this._selectedDates = [];
     this._inputValue = "";
     this._floatingDateCount = 0;
+    this._calendarEl.handleClearSelectedDates();
   }
 
   openPopover() {
@@ -197,6 +197,12 @@ export default class BlDatepicker extends DatepickerCalendarMixin {
     }
   }
 
+  updated(changedProperties: PropertyValues) {
+    if (changedProperties.has("_selectedDates")) {
+      this.setDatePickerInput(this._selectedDates);
+    }
+  }
+
   disconnectedCallback() {
     super.disconnectedCallback();
     this._calendarEl?.removeEventListener("mousedown", this._onCalendarMouseDown);
@@ -242,7 +248,7 @@ export default class BlDatepicker extends DatepickerCalendarMixin {
               variant="tertiary"
               kind="neutral"
               icon="close"
-              @click=${() => this.clearDatepicker()}
+              @click=${this.clearDatepicker}
             ></bl-button>
             <div class="action-divider"></div>`
         : "";

diff --git a/src/mixins/datepicker-calendar-mixin/datepicker-calendar-mixin.ts b/src/mixins/datepicker-calendar-mixin/datepicker-calendar-mixin.ts
@@ -34,7 +34,6 @@ export default class DatepickerCalendarMixin extends LitElement {
 
   @property({
     attribute: "disabled-dates",
-    type: Array,
     reflect: true,
   })
   set disabledDates(disabledDates: Date[] | string) {