Merge pull request #2150 from Parvinmh/fix/tour

merge new options and defualt options

Author: binrysearch

src/packages/hint/hint.ts

@@ -45,7 +45,7 @@ export class Hint implements Package<HintOptions> {
   ) {
     this._targetElement = getContainerElement(elementOrSelector);
     this._options = options
-      ? setOptions(this._options, options)
+      ? setOptions(this._options, { ...getDefaultHintOptions(), ...options })
       : getDefaultHintOptions();
   }
 

src/packages/tour/tour.test.ts

@@ -19,7 +19,6 @@ import {
   waitMsForExitTransition,
 } from "../../util/sleep";
 import { axe, toHaveNoViolations } from "jest-axe";
-
 expect.extend(toHaveNoViolations);
 jest.setTimeout(40000);
 
@@ -47,6 +46,19 @@ describe("Tour", () => {
       // Assert
       expect(tour.getTargetElement()).toBe(stubTargetElement);
     });
+
+    test("should merge user options with default options", () => {
+      // Arrange
+      const userOptions = { showStepNumbers: true };
+
+      // Act
+      const tour = new Tour(undefined, userOptions);
+
+      // Assert
+      expect(tour.getOption("showStepNumbers")).toBe(true);
+      expect(tour.getOption("showButtons")).toBe(true);
+      expect(tour.getOption("exitOnEsc")).toBe(true);
+    });
   });
 
   describe("start", () => {

src/packages/tour/tour.ts

@@ -62,7 +62,7 @@ export class Tour implements Package<TourOptions> {
   ) {
     this._targetElement = getContainerElement(elementOrSelector);
     this._options = options
-      ? setOptions(this._options, options)
+      ? setOptions(this._options, { ...getDefaultTourOptions(), ...options })
       : getDefaultTourOptions();
   }