linear-react-components-ui 1.0.3-beta.2 → 1.0.3-beta.3

package/lib/dialog/dialog.spec.js

@@ -0,0 +1,488 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+var _react = _interopRequireDefault(require("react"));
+
+require("babel-polyfill");
+
+require("@testing-library/jest-dom");
+
+var _react2 = require("@testing-library/react");
+
+var _ = _interopRequireWildcard(require("."));
+
+var _Header = _interopRequireDefault(require("./base/Header"));
+
+var _Content = _interopRequireDefault(require("./base/Content"));
+
+var _Footer = _interopRequireDefault(require("./base/Footer"));
+
+var _form = _interopRequireDefault(require("./form"));
+
+var _buttons = require("../buttons");
+
+var _icons = _interopRequireDefault(require("../icons"));
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+var baseDialog = function baseDialog(propsDialog, propsHeader) {
+  return /*#__PURE__*/_react.default.createElement(_.default, _extends({
+    width: "70%",
+    height: "70%",
+    wrapperClassName: "dialog-base-wrapper",
+    closeOnOutsideClick: true,
+    closeOnEsc: true
+  }, propsDialog), /*#__PURE__*/_react.default.createElement(_Header.default, _extends({
+    title: "Dialog Header"
+  }, propsHeader)), /*#__PURE__*/_react.default.createElement(_Content.default, null, "Dialog Content"), /*#__PURE__*/_react.default.createElement(_Footer.default, null, /*#__PURE__*/_react.default.createElement(_buttons.ButtonContainer, null, /*#__PURE__*/_react.default.createElement(_buttons.PrimaryButton, {
+    label: "Salvar"
+  }), /*#__PURE__*/_react.default.createElement(_buttons.CancelButton, {
+    label: "Cancelar"
+  }))));
+};
+
+var formDialog = function formDialog(props) {
+  return /*#__PURE__*/_react.default.createElement(_form.default, _extends({
+    title: "Modal Form",
+    height: "400px",
+    width: "400px",
+    styleForContent: {
+      backgroundColor: '#f00'
+    },
+    handlerClose: function handlerClose() {},
+    buttons: [/*#__PURE__*/_react.default.createElement(_buttons.PrimaryButton, {
+      label: "Adicionar"
+    }), /*#__PURE__*/_react.default.createElement(_buttons.CancelButton, {
+      label: "Cancelar"
+    })]
+  }, props), /*#__PURE__*/_react.default.createElement("p", null, "Modal Form"));
+};
+
+describe('Dialog', function () {
+  var dialogTestId = 'dialog-component';
+  describe('Base', function () {
+    it('should render correctly', function () {
+      var _render = (0, _react2.render)(baseDialog({}, {
+        handlerClose: function handlerClose() {}
+      })),
+          getByTestId = _render.getByTestId;
+
+      expect(getByTestId(dialogTestId)).toBeTruthy();
+      expect(getByTestId(dialogTestId).querySelector('.dialog-base-wrapper')).toHaveStyle({
+        width: '70%',
+        height: '70%'
+      });
+      expect(getByTestId(dialogTestId)).toContainElement(getByTestId(dialogTestId).querySelector('.dialog-header'));
+      expect(getByTestId(dialogTestId)).toContainElement(getByTestId(dialogTestId).querySelector('.dialog-content'));
+      expect(getByTestId(dialogTestId)).toContainElement(getByTestId(dialogTestId).querySelector('.footer'));
+    });
+    it('should close dialog when click outside', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+      var handlerClose, _render2, getByTestId;
+
+      return regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              handlerClose = jest.fn();
+              _render2 = (0, _react2.render)(baseDialog({
+                handlerClose: handlerClose
+              }, {
+                handlerClose: function handlerClose() {}
+              })), getByTestId = _render2.getByTestId;
+
+              _react2.fireEvent.click(getByTestId('modal-overlay'));
+
+              expect(handlerClose).toBeCalledTimes(1);
+
+            case 4:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    })));
+    it('should close dialog when press ESCAPE', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+      var handlerClose, _render3, getByTestId;
+
+      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              handlerClose = jest.fn();
+              _render3 = (0, _react2.render)(baseDialog({
+                handlerClose: handlerClose
+              }, {
+                handlerClose: function handlerClose() {}
+              })), getByTestId = _render3.getByTestId;
+
+              _react2.fireEvent.keyUp(getByTestId(dialogTestId), {
+                key: 'Escape',
+                code: 'Escape',
+                keyCode: 27,
+                charCode: 27
+              });
+
+              expect(handlerClose).toBeCalledTimes(1);
+
+            case 4:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    })));
+    it('should remove overlay', function () {
+      (0, _react2.render)(baseDialog({
+        overlay: false
+      }, {
+        handlerClose: function handlerClose() {}
+      }));
+      expect(document.querySelector('.modal-overlay')).not.toBeInTheDocument();
+    });
+    describe('Dialog Header', function () {
+      it('should render title', function () {
+        (0, _react2.render)(baseDialog({}, {
+          handlerClose: function handlerClose() {}
+        }));
+        expect(document.querySelector('.dialog-header')).toBeInTheDocument();
+        expect(document.querySelector('.dialog-header')).toHaveTextContent('Dialog Header');
+      });
+      it('should render title icon', function () {
+        var _render4 = (0, _react2.render)(baseDialog({}, {
+          handlerClose: function handlerClose() {},
+          titleIcon: 'user'
+        })),
+            getByTestId = _render4.getByTestId;
+
+        expect(document.querySelector('.dialog-header')).toContainElement(getByTestId('icon'));
+      });
+      it('should render icon', function () {
+        var _render5 = (0, _react2.render)(baseDialog({}, {
+          handlerClose: function handlerClose() {},
+          icon: /*#__PURE__*/_react.default.createElement(_icons.default, {
+            name: "user"
+          })
+        })),
+            getByTestId = _render5.getByTestId;
+
+        expect(document.querySelector('.dialog-header')).toContainElement(getByTestId('icon'));
+      });
+      it('should remove close button', function () {
+        var _render6 = (0, _react2.render)(baseDialog({}, {
+          handlerClose: function handlerClose() {},
+          showCloseButton: false
+        })),
+            getByTestId = _render6.getByTestId;
+
+        expect(document.querySelector('.dialog-header')).not.toContainElement(getByTestId(dialogTestId).querySelector('.close-button'));
+      });
+      it('should fire click on button close', function () {
+        var mockHandlerClose = jest.fn();
+
+        var _render7 = (0, _react2.render)(baseDialog({}, {
+          handlerClose: mockHandlerClose
+        })),
+            getByTestId = _render7.getByTestId;
+
+        _react2.fireEvent.click(getByTestId(dialogTestId).querySelector('.close-button'));
+
+        expect(mockHandlerClose).toBeCalledTimes(1);
+      });
+    });
+    describe('Dialog Content', function () {
+      it('should render correctly', function () {
+        var _render8 = (0, _react2.render)(baseDialog({}, {
+          handlerClose: function handlerClose() {}
+        })),
+            getByTestId = _render8.getByTestId;
+
+        expect(getByTestId(dialogTestId).querySelector('.dialog-content')).toBeInTheDocument();
+      });
+      it('should render children', function () {
+        var _render9 = (0, _react2.render)(baseDialog({}, {
+          handlerClose: function handlerClose() {}
+        })),
+            getByTestId = _render9.getByTestId;
+
+        expect(getByTestId(dialogTestId).querySelector('.dialog-content')).toHaveTextContent('Dialog Content');
+      });
+    });
+    describe('Dialog Footer', function () {
+      it('should render correctly', function () {
+        var _render10 = (0, _react2.render)(baseDialog({}, {
+          handlerClose: function handlerClose() {}
+        })),
+            getByTestId = _render10.getByTestId;
+
+        expect(getByTestId(dialogTestId).querySelector('.footer')).toBeInTheDocument();
+      });
+      it('should render children', function () {
+        var _render11 = (0, _react2.render)(baseDialog({}, {
+          handlerClose: function handlerClose() {}
+        })),
+            getByTestId = _render11.getByTestId;
+
+        expect(getByTestId(dialogTestId).querySelectorAll('.button-component').length).toBe(2);
+        expect(getByTestId(dialogTestId).querySelectorAll('.button-component')[0]).toHaveTextContent('Salvar');
+        expect(getByTestId(dialogTestId).querySelectorAll('.button-component')[0]).toHaveClass('-primary');
+        expect(getByTestId(dialogTestId).querySelectorAll('.button-component')[1]).toHaveTextContent('Cancelar');
+        expect(getByTestId(dialogTestId).querySelectorAll('.button-component')[1]).toHaveClass('-default');
+      });
+    });
+  });
+  describe('Form Dialog', function () {
+    it('should render correctly', function () {
+      var _render12 = (0, _react2.render)(formDialog()),
+          getByTestId = _render12.getByTestId;
+
+      expect(document.querySelector('.dialog-form-wrapper')).toBeInTheDocument();
+      expect(getByTestId(dialogTestId)).toContainElement(getByTestId(dialogTestId).querySelector('.dialog-header'));
+      expect(getByTestId(dialogTestId)).toContainElement(getByTestId(dialogTestId).querySelector('.dialog-content'));
+      expect(getByTestId(dialogTestId)).toContainElement(getByTestId(dialogTestId).querySelector('.footer'));
+      expect(document.querySelectorAll('.button-component').length).toBe(2);
+      expect(document.querySelectorAll('.button-component')[0]).toHaveTextContent('Adicionar');
+      expect(document.querySelectorAll('.button-component')[1]).toHaveTextContent('Cancelar');
+    });
+    it('should apply style for content', function () {
+      var _render13 = (0, _react2.render)(formDialog()),
+          getByTestId = _render13.getByTestId;
+
+      expect(getByTestId(dialogTestId).querySelector('.dialog-content')).toHaveStyle('background-color: #f00;');
+    });
+    it('should put the dialog on hold by isWaiting', function () {
+      var _render14 = (0, _react2.render)(formDialog({
+        isWaiting: true
+      })),
+          getByTestId = _render14.getByTestId;
+
+      expect(getByTestId(dialogTestId)).toContainElement(getByTestId('spinner'));
+    });
+    it('should remove footer', function () {
+      var _render15 = (0, _react2.render)(formDialog({
+        showFooter: false
+      })),
+          getByTestId = _render15.getByTestId;
+
+      expect(getByTestId(dialogTestId).querySelector('.footer')).not.toBeInTheDocument();
+    });
+  });
+  describe('Custom Dialog', function () {
+    describe('Custom', function () {
+      var defaultDialogCustom = function defaultDialogCustom(props) {
+        return /*#__PURE__*/_react.default.createElement(_.DialogCustom, _extends({
+          title: "Custom",
+          text: "Mensagem de Teste Custom!",
+          icon: /*#__PURE__*/_react.default.createElement(_icons.default, {
+            name: "code"
+          }),
+          buttons: [/*#__PURE__*/_react.default.createElement(_buttons.PrimaryButton, {
+            label: "Salvar"
+          })]
+        }, props));
+      };
+
+      it('should render correctly', function () {
+        var _render16 = (0, _react2.render)(defaultDialogCustom()),
+            getByTestId = _render16.getByTestId;
+
+        expect(getByTestId(dialogTestId)).toBeInTheDocument();
+        expect(getByTestId(dialogTestId).querySelector('.container .title')).toHaveTextContent('Custom');
+        expect(getByTestId(dialogTestId).querySelector('.container .text')).toHaveTextContent('Mensagem de Teste Custom!');
+      });
+      it('should render icon', function () {
+        var _render17 = (0, _react2.render)(defaultDialogCustom()),
+            getByTestId = _render17.getByTestId;
+
+        expect(getByTestId(dialogTestId)).toContainElement(getByTestId('icon'));
+      });
+      it('should render buttons', function () {
+        var _render18 = (0, _react2.render)(defaultDialogCustom()),
+            getByTestId = _render18.getByTestId;
+
+        expect(getByTestId(dialogTestId).querySelectorAll('.button-component').length).toBe(1);
+        expect(getByTestId(dialogTestId).querySelectorAll('.button-component')[0]).toHaveTextContent('Salvar');
+      });
+      it('should apply width', function () {
+        var _render19 = (0, _react2.render)(defaultDialogCustom({
+          width: '400px'
+        })),
+            getByTestId = _render19.getByTestId;
+
+        expect(getByTestId(dialogTestId).querySelector('.dialog-alert-wrapper')).toHaveStyle({
+          width: '400px'
+        });
+      });
+      it('should apply height', function () {
+        var _render20 = (0, _react2.render)(defaultDialogCustom({
+          height: '400px'
+        })),
+            getByTestId = _render20.getByTestId;
+
+        expect(getByTestId(dialogTestId).querySelector('.dialog-alert-wrapper')).toHaveStyle({
+          height: '400px'
+        });
+      });
+    });
+    describe('Alert', function () {
+      var mockOnConfirmClick = jest.fn();
+
+      var defaultDialogAlert = function defaultDialogAlert(props) {
+        return /*#__PURE__*/_react.default.createElement(_.DialogAlert, _extends({
+          title: "Alert",
+          onConfirmClick: mockOnConfirmClick,
+          text: "Mensagem de Teste Alert!"
+        }, props));
+      };
+
+      it('should render correctly', function () {
+        var _render21 = (0, _react2.render)(defaultDialogAlert()),
+            getByTestId = _render21.getByTestId;
+
+        expect(getByTestId(dialogTestId)).toBeInTheDocument();
+        expect(getByTestId(dialogTestId).querySelector('.container .title')).toHaveTextContent('Alert');
+        expect(getByTestId(dialogTestId).querySelector('.container .text')).toHaveTextContent('Mensagem de Teste Alert!');
+      });
+      it('should fire event on confirm click', function () {
+        var _render22 = (0, _react2.render)(defaultDialogAlert()),
+            getByTestId = _render22.getByTestId;
+
+        _react2.fireEvent.click(getByTestId(dialogTestId).querySelector('.button-component.-primary'));
+
+        expect(mockOnConfirmClick).toBeCalledTimes(1);
+      });
+    });
+    describe('Error', function () {
+      var mockOnConfirmClick = jest.fn();
+
+      var defaultDialogError = function defaultDialogError(props) {
+        return /*#__PURE__*/_react.default.createElement(_.DialogError, _extends({
+          title: "Error",
+          onConfirmClick: mockOnConfirmClick,
+          text: "Mensagem de Teste Error!"
+        }, props));
+      };
+
+      it('should render correctly', function () {
+        var _render23 = (0, _react2.render)(defaultDialogError()),
+            getByTestId = _render23.getByTestId;
+
+        expect(getByTestId(dialogTestId)).toBeInTheDocument();
+        expect(getByTestId(dialogTestId).querySelector('.container .title')).toHaveTextContent('Error');
+        expect(getByTestId(dialogTestId).querySelector('.container .text')).toHaveTextContent('Mensagem de Teste Error!');
+      });
+      it('should fire event on confirm click', function () {
+        var _render24 = (0, _react2.render)(defaultDialogError()),
+            getByTestId = _render24.getByTestId;
+
+        _react2.fireEvent.click(getByTestId(dialogTestId).querySelector('.button-component.-primary'));
+
+        expect(mockOnConfirmClick).toBeCalledTimes(1);
+      });
+    });
+    describe('Information', function () {
+      var mockOnConfirmClick = jest.fn();
+
+      var defaultDialogInformation = function defaultDialogInformation(props) {
+        return /*#__PURE__*/_react.default.createElement(_.DialogInformation, _extends({
+          title: "Information",
+          onConfirmClick: mockOnConfirmClick,
+          text: "Mensagem de Teste Information!"
+        }, props));
+      };
+
+      it('should render correctly', function () {
+        var _render25 = (0, _react2.render)(defaultDialogInformation()),
+            getByTestId = _render25.getByTestId;
+
+        expect(getByTestId(dialogTestId)).toBeInTheDocument();
+        expect(getByTestId(dialogTestId).querySelector('.container .title')).toHaveTextContent('Information');
+        expect(getByTestId(dialogTestId).querySelector('.container .text')).toHaveTextContent('Mensagem de Teste Information!');
+      });
+      it('should fire event on confirm click', function () {
+        var _render26 = (0, _react2.render)(defaultDialogInformation()),
+            getByTestId = _render26.getByTestId;
+
+        _react2.fireEvent.click(getByTestId(dialogTestId).querySelector('.button-component.-primary'));
+
+        expect(mockOnConfirmClick).toBeCalledTimes(1);
+      });
+    });
+    describe('Warning', function () {
+      var mockOnConfirmClick = jest.fn();
+
+      var defaultDialogWarning = function defaultDialogWarning(props) {
+        return /*#__PURE__*/_react.default.createElement(_.DialogWarning, _extends({
+          title: "Warning",
+          onConfirmClick: mockOnConfirmClick,
+          text: "Mensagem de Teste Warning!"
+        }, props));
+      };
+
+      it('should render correctly', function () {
+        var _render27 = (0, _react2.render)(defaultDialogWarning()),
+            getByTestId = _render27.getByTestId;
+
+        expect(getByTestId(dialogTestId)).toBeInTheDocument();
+        expect(getByTestId(dialogTestId).querySelector('.container .title')).toHaveTextContent('Warning');
+        expect(getByTestId(dialogTestId).querySelector('.container .text')).toHaveTextContent('Mensagem de Teste Warning!');
+      });
+      it('should fire event on confirm click', function () {
+        var _render28 = (0, _react2.render)(defaultDialogWarning()),
+            getByTestId = _render28.getByTestId;
+
+        _react2.fireEvent.click(getByTestId(dialogTestId).querySelector('.button-component.-primary'));
+
+        expect(mockOnConfirmClick).toBeCalledTimes(1);
+      });
+    });
+    describe('Question', function () {
+      var mockOnConfirmClick = jest.fn();
+      var mockOnUnConfirmClick = jest.fn();
+
+      var defaultDialogQuestion = function defaultDialogQuestion(props) {
+        return /*#__PURE__*/_react.default.createElement(_.DialogQuestion, _extends({
+          title: "Question",
+          onConfirmClick: mockOnConfirmClick,
+          onUnconfirmClick: mockOnUnConfirmClick,
+          text: "Mensagem de Teste Question!"
+        }, props));
+      };
+
+      it('should render correctly', function () {
+        var _render29 = (0, _react2.render)(defaultDialogQuestion()),
+            getByTestId = _render29.getByTestId;
+
+        expect(getByTestId(dialogTestId)).toBeInTheDocument();
+        expect(getByTestId(dialogTestId).querySelector('.container .title')).toHaveTextContent('Question');
+        expect(getByTestId(dialogTestId).querySelector('.container .text')).toHaveTextContent('Mensagem de Teste Question!');
+      });
+      it('should fire event on confirm click', function () {
+        var _render30 = (0, _react2.render)(defaultDialogQuestion()),
+            getByTestId = _render30.getByTestId;
+
+        _react2.fireEvent.click(getByTestId(dialogTestId).querySelector('.button-component.-danger'));
+
+        expect(mockOnConfirmClick).toBeCalledTimes(1);
+      });
+      it('should fire event on unconfirm click', function () {
+        var _render31 = (0, _react2.render)(defaultDialogQuestion()),
+            getByText = _render31.getByText;
+
+        _react2.fireEvent.click(getByText('Não'));
+
+        expect(mockOnUnConfirmClick).toBeCalledTimes(1);
+      });
+    });
+  });
+});

package/lib/drawer/Content.d.ts

@@ -1,7 +1,6 @@
 import { IDrawerProps } from './types.js';
 import 'react';
 import '../@types/PermissionAttr.js';
-import '../@types/Position.js';
 
 declare const Content: ({ children, style }: IDrawerProps) => JSX.Element;
 

package/lib/drawer/Drawer.d.ts

@@ -1,7 +1,6 @@
 import React__default from 'react';
 import { IDrawerProps } from './types.js';
 import '../@types/PermissionAttr.js';
-import '../@types/Position.js';
 
 declare const BaseDrawer: ({ position, customClass, children, style, customClassForContent, targetId, closeOnEsc, overlay, permissionAttr, skeletonize, handlerClose, customClassForDrawer, content, title, ...rest }: IDrawerProps) => React__default.ReactPortal;
 

package/lib/drawer/Drawer.js

@@ -46,20 +46,17 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 var BaseDrawer = function BaseDrawer(_ref) {
   var _ref$position = _ref.position,
       position = _ref$position === void 0 ? 'left' : _ref$position,
-      _ref$customClass = _ref.customClass,
-      customClass = _ref$customClass === void 0 ? '' : _ref$customClass,
+      customClass = _ref.customClass,
       children = _ref.children,
       style = _ref.style,
-      _ref$customClassForCo = _ref.customClassForContent,
-      customClassForContent = _ref$customClassForCo === void 0 ? '' : _ref$customClassForCo,
+      customClassForContent = _ref.customClassForContent,
       targetId = _ref.targetId,
       closeOnEsc = _ref.closeOnEsc,
       overlay = _ref.overlay,
       permissionAttr = _ref.permissionAttr,
       skeletonize = _ref.skeletonize,
       handlerClose = _ref.handlerClose,
-      _ref$customClassForDr = _ref.customClassForDrawer,
-      customClassForDrawer = _ref$customClassForDr === void 0 ? '' : _ref$customClassForDr,
+      customClassForDrawer = _ref.customClassForDrawer,
       content = _ref.content,
       title = _ref.title,
       rest = _objectWithoutProperties(_ref, _excluded);