@k-int/stripes-kint-components 1.7.0 → 1.7.1

package/es/lib/ActionList/ActionListFieldArray.js

@@ -1,83 +1,24 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _react = _interopRequireWildcard(require("react"));
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _reactIntl = require("react-intl");
-
 var _get = _interopRequireDefault(require("lodash/get"));
-
 var _reactFinalForm = require("react-final-form");
-
 var _components = require("@folio/stripes/components");
-
 var _ActionListFieldArray = _interopRequireDefault(require("../../../styles/ActionListFieldArray.css"));
-
 var _jsxRuntime = require("react/jsx-runtime");
-
-var _excluded = ["actionListActions"],
-    _excluded2 = ["actionListActions"],
-    _excluded3 = ["actionListActions"];
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-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 () {
-  var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
-  enterModule && enterModule(module);
-})();
-
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
-  return a;
-};
-
-var EDITING_ACTIONS_WIDTH = 25;
-var NON_EDITING_ACTIONS_WIDTH = 20;
-var TOTAL_WIDTH = 100;
-var propTypes = {
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+const EDITING_ACTIONS_WIDTH = 25;
+const NON_EDITING_ACTIONS_WIDTH = 20;
+const TOTAL_WIDTH = 100;
+const propTypes = {
   actionAssigner: _propTypes.default.func,
   actionCalls: _propTypes.default.object,
   columnMapping: _propTypes.default.object,
@@ -86,101 +27,92 @@ var propTypes = {
   fields: _propTypes.default.object,
   visibleFields: _propTypes.default.arrayOf(_propTypes.default.string)
 };
-
-var ActionListFieldArray = function ActionListFieldArray(_ref) {
-  var actionAssigner = _ref.actionAssigner,
-      actionCalls = _ref.actionCalls,
-      columnMapping = _ref.columnMapping,
-      creatableFields = _ref.creatableFields,
-      editableFields = _ref.editableFields,
-      fields = _ref.fields,
-      visibleFields = _ref.visibleFields;
-
+const ActionListFieldArray = _ref => {
+  let {
+    actionAssigner,
+    actionCalls,
+    columnMapping,
+    creatableFields,
+    editableFields,
+    fields,
+    visibleFields
+  } = _ref;
   // Grab finalForm functions/values from form hooks
-  var _useForm = (0, _reactFinalForm.useForm)(),
-      change = _useForm.change;
+  const {
+    change
+  } = (0, _reactFinalForm.useForm)();
+  const {
+    initialValues,
+    pristine,
+    submitting,
+    values
+  } = (0, _reactFinalForm.useFormState)();
 
-  var _useFormState = (0, _reactFinalForm.useFormState)(),
-      initialValues = _useFormState.initialValues,
-      pristine = _useFormState.pristine,
-      submitting = _useFormState.submitting,
-      values = _useFormState.values;
   /*
     Keep track of which field we are editing.
     null for no field, string id if we are editing an existing field and
     'NEW_ROW' for a new row
   */
-
-
-  var _useState = (0, _react.useState)(null),
-      _useState2 = _slicedToArray(_useState, 2),
-      editing = _useState2[0],
-      setEditing = _useState2[1];
-
-  var toggleEditing = function toggleEditing(id) {
+  const [editing, setEditing] = (0, _react.useState)(null);
+  const toggleEditing = id => {
     if (editing) {
       setEditing(null);
     } else {
       setEditing(id);
     }
   };
-
-  var handleSave = function handleSave(index) {
-    var _fields$value$index = fields.value[index],
-        _a = _fields$value$index.actionListActions,
-        rowData = _objectWithoutProperties(_fields$value$index, _excluded);
-
+  const handleSave = index => {
+    const {
+      actionListActions: _a,
+      ...rowData
+    } = fields.value[index];
     actionCalls.edit(rowData);
   };
-
-  var handleCreate = function handleCreate(index) {
-    var _fields$value$index2 = fields.value[index],
-        _a = _fields$value$index2.actionListActions,
-        rowData = _objectWithoutProperties(_fields$value$index2, _excluded2);
-
+  const handleCreate = index => {
+    const {
+      actionListActions: _a,
+      ...rowData
+    } = fields.value[index];
     actionCalls.create(rowData);
   };
-
-  var getColumnWidths = function getColumnWidths() {
-    var widthNotInUseByActions = editing ? TOTAL_WIDTH - EDITING_ACTIONS_WIDTH : TOTAL_WIDTH - NON_EDITING_ACTIONS_WIDTH;
-    var staticWidth = widthNotInUseByActions / visibleFields.length;
-    var widthsObject = {};
-    visibleFields.forEach(function (f) {
+  const getColumnWidths = () => {
+    const widthNotInUseByActions = editing ? TOTAL_WIDTH - EDITING_ACTIONS_WIDTH : TOTAL_WIDTH - NON_EDITING_ACTIONS_WIDTH;
+    const staticWidth = widthNotInUseByActions / visibleFields.length;
+    const widthsObject = {};
+    visibleFields.forEach(f => {
       if (f !== 'actionListActions') {
-        widthsObject[f] = "".concat(staticWidth, "%");
+        widthsObject[f] = `${staticWidth}%`;
       }
     });
-    widthsObject.actionListActions = editing ? "".concat(EDITING_ACTIONS_WIDTH, "%") : "".concat(NON_EDITING_ACTIONS_WIDTH, "%");
+    widthsObject.actionListActions = editing ? `${EDITING_ACTIONS_WIDTH}%` : `${NON_EDITING_ACTIONS_WIDTH}%`;
     return widthsObject;
   };
-
-  var renderActionButtons = function renderActionButtons(data) {
-    var fieldName = "contentData[".concat(data.rowIndex, "]");
-
-    var actions = data.actionListActions,
-        rest = _objectWithoutProperties(data, _excluded3);
-
+  const renderActionButtons = data => {
+    const fieldName = `contentData[${data.rowIndex}]`;
+    const {
+      actionListActions: actions,
+      ...rest
+    } = data;
     if (data.id === editing || !data.id && editing === 'NEW_ROW') {
       // Render the save/cancel buttons
       return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
           buttonStyle: "primary",
           disabled: submitting || pristine,
-          onClick: function onClick() {
+          onClick: () => {
             if (!data.id && editing === 'NEW_ROW') {
               handleCreate(data.rowIndex);
             } else {
               handleSave(data.rowIndex);
             }
-
             toggleEditing(data.id);
           },
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
             id: "stripes-kint-components.actionList.save"
           })
-        }, "save[".concat(data.rowIndex, "]")), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
+        }, `save[${data.rowIndex}]`), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
           "data-type-button": "cancel",
-          onClick: function onClick() {
+          onClick: () => {
             if (!data.id && editing === 'NEW_ROW') {
               fields.remove(data.rowIndex);
               toggleEditing('NEW_ROW');
@@ -192,106 +124,80 @@ var ActionListFieldArray = function ActionListFieldArray(_ref) {
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
             id: "stripes-kint-components.actionList.cancel"
           })
-        }, "cancel[".concat(data.rowIndex, "]"))]
+        }, `cancel[${data.rowIndex}]`)]
       });
     }
-
     return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      children: actions === null || actions === void 0 ? void 0 : actions.map(function (action) {
-        var _action$label;
-
-        var actionFunction = function actionFunction() {
-          return actionCalls[action.name](rest);
-        }; // Edit has special action functionality, revealing fields etc.
-
-
+      children: actions?.map(action => {
+        let actionFunction = () => actionCalls[action.name](rest);
+        // Edit has special action functionality, revealing fields etc.
         if (action.name === 'edit') {
-          actionFunction = function actionFunction() {
-            return toggleEditing(data.id);
-          };
-        } // If we're handed an icon, use that for the action button
-
+          actionFunction = () => toggleEditing(data.id);
+        }
 
+        // If we're handed an icon, use that for the action button
         if (action.icon) {
           return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.IconButton, {
             disabled: editing,
             icon: action.icon,
             onClick: actionFunction
-          }, "action-".concat(action.name, "[").concat(data.rowIndex, "]"));
-        } // Else return a button with the label, or failing that the name of the action
-
+          }, `action-${action.name}[${data.rowIndex}]`);
+        }
 
+        // Else return a button with the label, or failing that the name of the action
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
           disabled: editing,
           onClick: actionFunction,
-          children: (_action$label = action.label) !== null && _action$label !== void 0 ? _action$label : action.name
-        }, "action-".concat(action.name, "[").concat(data.rowIndex, "]"));
+          children: action.label ?? action.name
+        }, `action-${action.name}[${data.rowIndex}]`);
       })
     });
   };
-
-  var formatContent = function formatContent() {
-    return fields.map(function (fieldName, fieldIndex) {
+  const formatContent = () => {
+    return fields.map((fieldName, fieldIndex) => {
       // Fetch the content from the field Values
-      var cd = (0, _get.default)(values, fieldName);
-      cd.actionListActions = actionAssigner(cd); // Row is being edited if it has no id, or its id is in the editing string
-
-      var editingRow = cd.id === editing || !cd.id;
-
-      var returnObj = _objectSpread({}, cd); // If editing, replace values with fields
+      const cd = (0, _get.default)(values, fieldName);
+      cd.actionListActions = actionAssigner(cd);
 
+      // Row is being edited if it has no id, or its id is in the editing string
+      const editingRow = cd.id === editing || !cd.id;
+      const returnObj = {
+        ...cd
+      };
 
+      // If editing, replace values with fields
       if (editingRow) {
         /*
           Check if the property is a visible field.
           If it is not then we don't allow editing in this component.
         */
-        var _iterator = _createForOfIteratorHelper(visibleFields),
-            _step;
-
-        try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            var _editableFields$key, _creatableFields$key;
-
-            var key = _step.value;
-            var editFunction = (_editableFields$key = editableFields[key]) !== null && _editableFields$key !== void 0 ? _editableFields$key : function () {
-              return true;
-            };
-            var createFunction = (_creatableFields$key = creatableFields[key]) !== null && _creatableFields$key !== void 0 ? _creatableFields$key : function () {
-              return true;
-            };
-            /*
-              Next check if this is a new row, if so we should run the createableField function with the data.
-              If it is not a new row, then we run the editableField function with the data,
-              and it should return true/false
-               For both checks
-              true => Field, false => display value
-            */
-
-            if (!cd.id && createFunction(cd) || editFunction(cd)) {
-              returnObj[key] = /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, {
-                autofocus: fieldIndex === 0,
-                component: _components.TextField,
-                name: "".concat(fieldName, ".").concat(key)
-              });
-            }
+        for (const key of visibleFields) {
+          const editFunction = editableFields[key] ?? (() => true);
+          const createFunction = creatableFields[key] ?? (() => true);
+          /*
+            Next check if this is a new row, if so we should run the createableField function with the data.
+            If it is not a new row, then we run the editableField function with the data,
+            and it should return true/false
+             For both checks
+            true => Field, false => display value
+          */
+          if (!cd.id && createFunction(cd) || editFunction(cd)) {
+            returnObj[key] = /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactFinalForm.Field, {
+              autofocus: fieldIndex === 0,
+              component: _components.TextField,
+              name: `${fieldName}.${key}`
+            });
           }
-        } catch (err) {
-          _iterator.e(err);
-        } finally {
-          _iterator.f();
         }
       }
-
       return returnObj;
     });
   };
-
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_components.Button, {
       buttonClass: _ActionListFieldArray.default.buttonRight,
       disabled: !actionCalls.create,
-      onClick: function onClick() {
+      onClick: () => {
         toggleEditing('NEW_ROW');
         fields.push({});
       },
@@ -299,50 +205,21 @@ var ActionListFieldArray = function ActionListFieldArray(_ref) {
         id: "stripes-kint-components.actionList.create"
       })
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.MultiColumnList, {
-      columnMapping: _objectSpread(_objectSpread({}, columnMapping), {}, {
+      columnMapping: {
+        ...columnMapping,
         actionListActions: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactIntl.FormattedMessage, {
           id: "stripes-kint-components.actionList.actions"
         })
-      }),
+      },
       columnWidths: getColumnWidths(),
       contentData: formatContent(),
       formatter: {
         actionListActions: renderActionButtons
       },
       interactive: false,
-      visibleColumns: [].concat(_toConsumableArray(visibleFields), ['actionListActions'])
+      visibleColumns: [...visibleFields, 'actionListActions']
     })]
   });
 };
-
-__signature__(ActionListFieldArray, "useForm{{ change }}\nuseFormState{{ initialValues, pristine, submitting, values }}\nuseState{[editing, setEditing](null)}", function () {
-  return [_reactFinalForm.useForm, _reactFinalForm.useFormState];
-});
-
 ActionListFieldArray.propTypes = propTypes;
-var _default = ActionListFieldArray;
-var _default2 = _default;
-exports.default = _default2;
-;
-
-(function () {
-  var reactHotLoader = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined;
-
-  if (!reactHotLoader) {
-    return;
-  }
-
-  reactHotLoader.register(EDITING_ACTIONS_WIDTH, "EDITING_ACTIONS_WIDTH", "/home/ethan/FolioModules/stripes-kint-components/src/lib/ActionList/ActionListFieldArray.js");
-  reactHotLoader.register(NON_EDITING_ACTIONS_WIDTH, "NON_EDITING_ACTIONS_WIDTH", "/home/ethan/FolioModules/stripes-kint-components/src/lib/ActionList/ActionListFieldArray.js");
-  reactHotLoader.register(TOTAL_WIDTH, "TOTAL_WIDTH", "/home/ethan/FolioModules/stripes-kint-components/src/lib/ActionList/ActionListFieldArray.js");
-  reactHotLoader.register(propTypes, "propTypes", "/home/ethan/FolioModules/stripes-kint-components/src/lib/ActionList/ActionListFieldArray.js");
-  reactHotLoader.register(ActionListFieldArray, "ActionListFieldArray", "/home/ethan/FolioModules/stripes-kint-components/src/lib/ActionList/ActionListFieldArray.js");
-  reactHotLoader.register(_default, "default", "/home/ethan/FolioModules/stripes-kint-components/src/lib/ActionList/ActionListFieldArray.js");
-})();
-
-;
-
-(function () {
-  var leaveModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.leaveModule : undefined;
-  leaveModule && leaveModule(module);
-})();
+var _default = exports.default = ActionListFieldArray;

package/es/lib/ActionList/index.js

@@ -5,15 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "default", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _ActionList.default;
   }
 });
-
 var _ActionList = _interopRequireDefault(require("./ActionList"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
-  return a;
-};
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }