@etsoo/notificationbase 1.1.18 → 1.1.20

package/__tests__/Notification.ts

@@ -1,3 +1,4 @@
+import { DataTypes } from '@etsoo/shared';
 import {
     INotificaseBase,
     INotification,
@@ -36,7 +37,7 @@ jest.useFakeTimers();
 
 test('Tests for basic data', () => {
     expect(Object.keys(container.notifications).length).toBe(
-        Object.keys(NotificationAlign).length / 2
+        DataTypes.getEnumKeys(NotificationAlign).length
     );
 });
 

package/lib/Notification.d.ts

@@ -2,16 +2,18 @@ import { DataTypes } from '@etsoo/shared';
 /**
  * Display align
  */
-export declare enum NotificationAlign {
-    TopLeft = 0,
-    TopCenter = 1,
-    TopRight = 2,
-    Center = 3,
-    Unknown = 4,
-    BottomLeft = 5,
-    BottomCenter = 6,
-    BottomRight = 7
-}
+export declare const NotificationAlign: {
+    [x: number]: string;
+    TopLeft: DataTypes.PlacementEnum.TopLeft;
+    TopCenter: DataTypes.PlacementEnum.TopCenter;
+    TopRight: DataTypes.PlacementEnum.TopRight;
+    Center: DataTypes.PlacementEnum.Center;
+    BottomLeft: DataTypes.PlacementEnum.BottomLeft;
+    BottomCenter: DataTypes.PlacementEnum.BottomCenter;
+    BottomRight: DataTypes.PlacementEnum.BottomRight;
+    Unknown: DataTypes.PlacementEnum.Unknown;
+};
+export type NotificationAlign = Exclude<DataTypes.PlacementEnum, DataTypes.PlacementEnum.MiddleLeft | DataTypes.PlacementEnum.MiddleRight>;
 /**
  * Modal types
  */
@@ -112,7 +114,7 @@ export type NotificationCallProps = {
 /**
  * Notification render props
  */
-export type NotificationRenderProps = object;
+export type NotificationRenderProps = DataTypes.StringRecord;
 /**
  * Notification base interface
  */

package/lib/Notification.js

@@ -1,18 +1,18 @@
-import { Utils } from '@etsoo/shared';
+import { DataTypes, Utils } from '@etsoo/shared';
+// https://devimalplanet.com/typescript-how-to-extend-one-enum-from-another
+// Number index keys are still there
+const { MiddleLeft, MiddleRight, ...alignItems } = DataTypes.PlacementEnum;
+const newItems = {
+    ...alignItems
+};
+delete newItems[MiddleLeft];
+delete newItems[MiddleRight];
 /**
  * Display align
  */
-export var NotificationAlign;
-(function (NotificationAlign) {
-    NotificationAlign[NotificationAlign["TopLeft"] = 0] = "TopLeft";
-    NotificationAlign[NotificationAlign["TopCenter"] = 1] = "TopCenter";
-    NotificationAlign[NotificationAlign["TopRight"] = 2] = "TopRight";
-    NotificationAlign[NotificationAlign["Center"] = 3] = "Center";
-    NotificationAlign[NotificationAlign["Unknown"] = 4] = "Unknown";
-    NotificationAlign[NotificationAlign["BottomLeft"] = 5] = "BottomLeft";
-    NotificationAlign[NotificationAlign["BottomCenter"] = 6] = "BottomCenter";
-    NotificationAlign[NotificationAlign["BottomRight"] = 7] = "BottomRight";
-})(NotificationAlign || (NotificationAlign = {}));
+export const NotificationAlign = {
+    ...newItems
+};
 /**
  * Modal types
  */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/notificationbase",
-    "version": "1.1.18",
+    "version": "1.1.20",
     "description": "TypeScript notification component for extending with all features described and partially implemented",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -45,23 +45,23 @@
     },
     "homepage": "https://github.com/ETSOO/NotificationBase#readme",
     "dependencies": {
-        "@etsoo/shared": "^1.1.78"
+        "@etsoo/shared": "^1.1.84"
     },
     "devDependencies": {
-        "@babel/core": "^7.20.2",
+        "@babel/core": "^7.20.5",
         "@babel/plugin-transform-runtime": "^7.19.6",
         "@babel/preset-env": "^7.20.2",
-        "@babel/runtime-corejs3": "^7.20.1",
-        "@types/jest": "^29.2.3",
-        "@typescript-eslint/eslint-plugin": "^5.43.0",
-        "@typescript-eslint/parser": "^5.43.0",
+        "@babel/runtime-corejs3": "^7.20.6",
+        "@types/jest": "^29.2.4",
+        "@typescript-eslint/eslint-plugin": "^5.47.0",
+        "@typescript-eslint/parser": "^5.47.0",
         "babel-jest": "^29.3.1",
-        "eslint": "^8.27.0",
+        "eslint": "^8.30.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "jest": "^29.3.1",
         "jest-environment-jsdom": "^29.3.1",
         "ts-jest": "^29.0.3",
-        "typescript": "^4.9.3"
+        "typescript": "^4.9.4"
     }
 }

package/src/Notification.ts

@@ -1,20 +1,24 @@
 import { DataTypes, Utils } from '@etsoo/shared';
 
+// https://devimalplanet.com/typescript-how-to-extend-one-enum-from-another
+// Number index keys are still there
+const { MiddleLeft, MiddleRight, ...alignItems } = DataTypes.PlacementEnum;
+const newItems = {
+    ...alignItems
+};
+delete newItems[MiddleLeft];
+delete newItems[MiddleRight];
+
 /**
  * Display align
  */
-export enum NotificationAlign {
-    TopLeft,
-    TopCenter,
-    TopRight,
-
-    Center,
-    Unknown, // Reserved for modal, only one instance held at the same time
-
-    BottomLeft,
-    BottomCenter,
-    BottomRight
-}
+export const NotificationAlign = {
+    ...newItems
+};
+export type NotificationAlign = Exclude<
+    DataTypes.PlacementEnum,
+    DataTypes.PlacementEnum.MiddleLeft | DataTypes.PlacementEnum.MiddleRight
+>;
 
 /**
  * Modal types
@@ -122,7 +126,7 @@ export type NotificationCallProps = {
 /**
  * Notification render props
  */
-export type NotificationRenderProps = object;
+export type NotificationRenderProps = DataTypes.StringRecord;
 
 /**
  * Notification base interface