@invoicebox/ui 0.1.0-alpha.210 → 0.1.0-alpha.212

package/dist/components/common/Drawer/index.js

@@ -24,6 +24,7 @@ var Drawer = exports.Drawer = function Drawer(_ref) {
     overflow = _ref.overflow,
     borderColor = _ref.borderColor;
   var palette = (0, _palette.useComponentPalette)('drawer');
+  if (!isOpen) return null;
   return /*#__PURE__*/_react["default"].createElement(S.BottomSheet, {
     open: isOpen,
     onDismiss: onClose,

package/dist/validate/index.d.ts

@@ -1,4 +1,5 @@
 import { TCreateErrorFunc } from './types';
+export declare const WEBSITE_WRONG_MESSAGE = "\u041D\u0435\u043A\u043E\u0440\u0440\u0435\u043A\u0442\u043D\u044B\u0439 \u0430\u0434\u0440\u0435\u0441";
 export declare class Validate {
     static bic(value: string, createError: TCreateErrorFunc): any;
     static website(value: string, createError: TCreateErrorFunc, isOnlyHttpsFormat?: boolean): any;

package/dist/validate/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.Validate = void 0;
+exports.WEBSITE_WRONG_MESSAGE = exports.Validate = void 0;
 var _vatNumberValidateHelpers = require("./utils/vatNumberValidateHelpers");
 var _types = require("../components/form/PhoneInput/types");
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
@@ -12,6 +12,7 @@ function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o =
 function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+var WEBSITE_WRONG_MESSAGE = exports.WEBSITE_WRONG_MESSAGE = 'Некорректный адрес';
 var Validate = exports.Validate = /*#__PURE__*/function () {
   function Validate() {
     _classCallCheck(this, Validate);
@@ -36,14 +37,14 @@ var Validate = exports.Validate = /*#__PURE__*/function () {
       if (value === '') {
         return true;
       }
-      var basePattern = "(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\\.)+[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?::\\d{1,5})?(?:\\/[\\w\\-\\.~!$&'()*+,;=:@%\\/?#]*)?";
-      var prefix = isOnlyHttpsFormat ? '^https://' : '^(https://)?';
-      var pattern = "".concat(prefix).concat(basePattern, "$");
-      var regex = new RegExp(pattern, 'iu');
+      var basePattern = "(?:(?:[a-z\xA1-\uFFFF](?:[a-z\xA1-\uFFFF-]{0,61}[a-z\xA1-\uFFFF])?\\.)+([a-z\xA1-\uFFFF]{2,63}))(?::\\d+)?)(?:\\/[\\w \\/-]*)*(?:\\?[^#\\s]*)?(?:\\#\\S*)";
+      var prefix = isOnlyHttpsFormat ? '^((https:\\/\\/)' : '^((?:https?:\\/\\/)?';
+      var pattern = "".concat(prefix).concat(basePattern, "?");
+      var regex = new RegExp(pattern, 'i');
       if (value.match(regex)) {
         return true;
       }
-      return createError('Некорректный адрес');
+      return createError(WEBSITE_WRONG_MESSAGE);
     }
   }, {
     key: "vatNumber",

package/dist/validate/utils/websiteValidate.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/validate/utils/websiteValidate.test.js

@@ -0,0 +1,47 @@
+"use strict";
+
+var _index = require("../index");
+describe('Website validate', function () {
+  var validateAllFunc = function validateAllFunc(value) {
+    return _index.Validate.website(value, function (result) {
+      return result;
+    });
+  };
+  test('validate web sites all variants', function () {
+    expect(validateAllFunc('abc.com')).toBe(true);
+    expect(validateAllFunc('http://abc.com')).toBe(true);
+    expect(validateAllFunc('https://abc.com')).toBe(true);
+    expect(validateAllFunc('http://www.abc.com')).toBe(true);
+    expect(validateAllFunc('https://www.abc.com')).toBe(true);
+    expect(validateAllFunc('https://дом.рф')).toBe(true);
+    expect(validateAllFunc('дом.рф')).toBe(true);
+    expect(validateAllFunc('http://abc.com/anyhere')).toBe(true);
+    expect(validateAllFunc('http://abc.com/anyhere/anyhere')).toBe(true);
+    expect(validateAllFunc('https://abc.com/anyhere/anyhere?any')).toBe(true);
+    expect(validateAllFunc('https://www')).toBe(_index.WEBSITE_WRONG_MESSAGE);
+    expect(validateAllFunc('www')).toBe(_index.WEBSITE_WRONG_MESSAGE);
+    expect(validateAllFunc('.com')).toBe(_index.WEBSITE_WRONG_MESSAGE);
+    expect(validateAllFunc('дом')).toBe(_index.WEBSITE_WRONG_MESSAGE);
+  });
+  var validateHttpsFunc = function validateHttpsFunc(value) {
+    return _index.Validate.website(value, function (result) {
+      return result;
+    }, true);
+  };
+  test('validate web sites only https variants', function () {
+    expect(validateHttpsFunc('https://abc.com')).toBe(true);
+    expect(validateHttpsFunc('https://www.abc.com')).toBe(true);
+    expect(validateHttpsFunc('https://дом.рф')).toBe(true);
+    expect(validateAllFunc('https://abc.com/anyhere')).toBe(true);
+    expect(validateAllFunc('https://abc.com/anyhere/anyhere')).toBe(true);
+    expect(validateAllFunc('https://abc.com/anyhere/anyhere?any')).toBe(true);
+    expect(validateHttpsFunc('дом.рф')).toBe(_index.WEBSITE_WRONG_MESSAGE);
+    expect(validateHttpsFunc('http://www.abc.com')).toBe(_index.WEBSITE_WRONG_MESSAGE);
+    expect(validateHttpsFunc('abc.com')).toBe(_index.WEBSITE_WRONG_MESSAGE);
+    expect(validateHttpsFunc('http://abc.com')).toBe(_index.WEBSITE_WRONG_MESSAGE);
+    // expect(validateHttpsFunc('https://www')).toBe(WEBSITE_WRONG_MESSAGE);
+    expect(validateHttpsFunc('www')).toBe(_index.WEBSITE_WRONG_MESSAGE);
+    expect(validateHttpsFunc('.com')).toBe(_index.WEBSITE_WRONG_MESSAGE);
+    expect(validateHttpsFunc('дом')).toBe(_index.WEBSITE_WRONG_MESSAGE);
+  });
+});

package/package.json

@@ -1,11 +1,12 @@
 {
     "name": "@invoicebox/ui",
-    "version": "0.1.0-alpha.210",
+    "version": "0.1.0-alpha.212",
     "description": "Invoicebox UI",
     "license": "Apache License 2.0",
     "scripts": {
         "storybook": "storybook dev -p 6006",
-        "release": "./release.sh"
+        "release": "./release.sh",
+        "test": "jest"
     },
     "bugs": {
         "url": "https://github.com/InvoiceBox/invoicebox-ui/issues"
@@ -30,6 +31,7 @@
         "@storybook/react": "^7.6.13",
         "@storybook/react-webpack5": "^7.6.13",
         "@storybook/test": "^7.6.13",
+        "@types/jest": "^29.5.8",
         "@typescript-eslint/eslint-plugin": "^5.62.0",
         "@typescript-eslint/parser": "^5.62.0",
         "babel-plugin-inline-json-import": "^0.3.2",
@@ -40,6 +42,7 @@
         "eslint-plugin-react": "^7.34.1",
         "eslint-plugin-react-hooks": "^4.6.0",
         "eslint-plugin-storybook": "^0.6.15",
+        "jest": "^29.7.0",
         "markdown-to-jsx": "^7.4.1",
         "prettier": "^3.2.5",
         "prop-types": "^15.8.1",