@zohodesk/components 1.0.0-alpha-248 → 1.0.0-alpha-249

package/README.md

@@ -32,6 +32,10 @@ In this Package, we Provide Some Basic Components to Build Web App
 - TextBoxIcon
 - Tooltip
 
+# 1.0.0-alpha-249
+
+ - color => secondary_border light mode color changes
+
 # 1.0.0-alpha-248
 
 - preventParentScroll props added for Box and Container
@@ -75,7 +79,7 @@ In this Package, we Provide Some Basic Components to Build Web App
 
 # 1.0.0-alpha-238
 
-- Tooltip optimizaion - container client rect calc is cached and only calc when resized.
+- Tooltip optimization - container client rect calc is cached and only calc when resized.
 - Provider/Config => tooltipContainer key removed and getTooltipContainer key added
 - PureDark mode implemented via preprocess
 

package/assets/Appearance/default/themes/blue/blueDefaultCTATheme.module.css

@@ -12,7 +12,7 @@
 	--zdt_cta_primary_light_border: var(--zd_primary13);
 	--zdt_cta_secondary_bg: var(--dot_primary);
 	--zdt_cta_secondary_text: var(--dot_white);
-	--zdt_cta_secondary_border: #2381ed;
+	--zdt_cta_secondary_border: #348EF9;
 	--zdt_cta_secondary_light_border: var(--dot_tropicalBlue);
 	--zdt_cta_alpha_text: var(--dot_primary);
 	--zdt_cta_alpha_hover_text: var(--dot_cobalt);

package/assets/Appearance/default/themes/green/greenDefaultCTATheme.module.css

@@ -12,7 +12,7 @@
 	--zdt_cta_primary_light_border: #d4eed9;
 	--zdt_cta_secondary_bg: #26a942;
 	--zdt_cta_secondary_text: var(--dot_white);
-	--zdt_cta_secondary_border: var(--dot_darkmint);
+	--zdt_cta_secondary_border: #4AC064;
 	--zdt_cta_secondary_light_border: #bee5c6;
 	--zdt_cta_alpha_text: #26a942;
 	--zdt_cta_alpha_hover_text: #0e7526;

package/assets/Appearance/default/themes/orange/orangeDefaultCTATheme.module.css

@@ -12,7 +12,7 @@
 	--zdt_cta_primary_light_border: #fae4d1;
 	--zdt_cta_secondary_bg: #e57717;
 	--zdt_cta_secondary_text: var(--dot_white);
-	--zdt_cta_secondary_border: #ea9245;
+	--zdt_cta_secondary_border: #EA9245;
 	--zdt_cta_secondary_light_border: #f7d6b9;
 	--zdt_cta_alpha_text: #e57717;
 	--zdt_cta_alpha_hover_text: #b25900;

package/assets/Appearance/default/themes/red/redDefaultCTATheme.module.css

@@ -12,7 +12,7 @@
 	--zdt_cta_primary_light_border: #f8d7d7;
 	--zdt_cta_secondary_bg: var(--dot_brightRed);
 	--zdt_cta_secondary_text: var(--dot_white);
-	--zdt_cta_secondary_border: #e55d5d;
+	--zdt_cta_secondary_border: #E55D5D;
 	--zdt_cta_secondary_light_border: #f8d7d7;
 	--zdt_cta_alpha_text: var(--dot_brightRed);
 	--zdt_cta_alpha_hover_text: #ab1a18;

package/assets/Appearance/default/themes/yellow/yellowDefaultCTATheme.module.css

@@ -12,7 +12,7 @@
 	--zdt_cta_primary_light_border: #f8eabd;
 	--zdt_cta_secondary_bg: #e8b923;
 	--zdt_cta_secondary_text: var(--dot_black);
-	--zdt_cta_secondary_border: rgba(255, 255, 255, 0.2);
+	--zdt_cta_secondary_border: #EFCE65;
 	--zdt_cta_secondary_light_border: #f6e3a7;
 	--zdt_cta_alpha_text: #b68c07;
 	--zdt_cta_alpha_hover_text: #826800;

package/es/Accordion/Accordion.js

@@ -1,5 +1,6 @@
 import React from 'react';
-import PropTypes from 'prop-types';
+import { Accordion_defaultProps } from './props/defaultProps';
+import { Accordion_propTypes } from './props/propTypes';
 export default class Accordion extends React.Component {
   constructor(props) {
     super(props);
@@ -70,25 +71,8 @@ export default class Accordion extends React.Component {
   }
 
 }
-Accordion.propTypes = {
-  children: PropTypes.node,
-  className: PropTypes.string,
-  disableInternalState: PropTypes.bool,
-  height: PropTypes.string,
-  onSelect: PropTypes.func,
-  selectedItem: PropTypes.string.isRequired,
-  unMount: PropTypes.bool,
-  a11y: PropTypes.shape({
-    role: PropTypes.string,
-    ariaExpanded: PropTypes.bool,
-    ariaHaspopup: PropTypes.bool
-  })
-};
-Accordion.defaultProps = {
-  unMount: true,
-  disableInternalState: false,
-  a11y: {}
-};
+Accordion.propTypes = Accordion_propTypes;
+Accordion.defaultProps = Accordion_defaultProps;
 
 if (false) {
   Accordion.docs = {

package/es/Accordion/AccordionItem.js

@@ -1,5 +1,6 @@
 import React from 'react';
-import PropTypes from 'prop-types';
+import { AccordionItem_defaultProps } from './props/defaultProps';
+import { AccordionItem_propTypes } from './props/propTypes';
 import VelocityAnimation from '../VelocityAnimation/VelocityAnimation/VelocityAnimation';
 import VelocityAnimationGroup from '../VelocityAnimation/VelocityAnimationGroup/VelocityAnimationGroup';
 export default class AccordionItem extends React.Component {
@@ -50,24 +51,8 @@ export default class AccordionItem extends React.Component {
   }
 
 }
-AccordionItem.propTypes = {
-  children: PropTypes.node,
-  className: PropTypes.string,
-  dataId: PropTypes.string,
-  equalityCheck: PropTypes.func,
-  id: PropTypes.string,
-  selectMenu: PropTypes.func,
-  selectedItem: PropTypes.string,
-  unMount: PropTypes.bool,
-  unMountItem: PropTypes.bool,
-  innerClass: PropTypes.string,
-  a11y: PropTypes.shape({
-    role: PropTypes.string
-  })
-};
-AccordionItem.defaultProps = {
-  a11y: {}
-};
+AccordionItem.propTypes = AccordionItem_propTypes;
+AccordionItem.defaultProps = AccordionItem_defaultProps;
 
 if (false) {
   AccordionItem.docs = {

package/es/Accordion/props/defaultProps.js

@@ -0,0 +1,8 @@
+export const Accordion_defaultProps = {
+  unMount: true,
+  disableInternalState: false,
+  a11y: {}
+};
+export const AccordionItem_defaultProps = {
+  a11y: {}
+};

package/es/Accordion/props/propTypes.js

@@ -0,0 +1,30 @@
+import PropTypes from 'prop-types';
+export const Accordion_propTypes = {
+  children: PropTypes.node,
+  className: PropTypes.string,
+  disableInternalState: PropTypes.bool,
+  height: PropTypes.string,
+  onSelect: PropTypes.func,
+  selectedItem: PropTypes.string.isRequired,
+  unMount: PropTypes.bool,
+  a11y: PropTypes.shape({
+    role: PropTypes.string,
+    ariaExpanded: PropTypes.bool,
+    ariaHaspopup: PropTypes.bool
+  })
+};
+export const AccordionItem_propTypes = {
+  children: PropTypes.node,
+  className: PropTypes.string,
+  dataId: PropTypes.string,
+  equalityCheck: PropTypes.func,
+  id: PropTypes.string,
+  selectMenu: PropTypes.func,
+  selectedItem: PropTypes.string,
+  unMount: PropTypes.bool,
+  unMountItem: PropTypes.bool,
+  innerClass: PropTypes.string,
+  a11y: PropTypes.shape({
+    role: PropTypes.string
+  })
+};

package/es/Animation/Animation.js

@@ -1,5 +1,6 @@
 import React from 'react';
-import PropTypes from 'prop-types';
+import { defaultProps } from './props/defaultProps';
+import { propTypes } from './props/propTypes';
 import { CSSTransition } from 'react-transition-group';
 import style from '../common/transition.module.css';
 export default class Animation extends React.Component {
@@ -122,30 +123,8 @@ export default class Animation extends React.Component {
   }
 
 }
-Animation.propTypes = {
-  children: PropTypes.node,
-  delayClassName: PropTypes.string,
-  enterDuration: PropTypes.number,
-  exitDuration: PropTypes.number,
-  isActive: PropTypes.bool,
-  name: PropTypes.oneOf(['zoomIn', 'scaleIn', 'fadeIn', 'slideLeft', 'slideDown', 'skewIn', 'default', 'none']),
-  onEntered: PropTypes.func,
-  onExit: PropTypes.func,
-  unmountOnExit: PropTypes.bool
-};
-Animation.defaultProps = {
-  enterDuration: 300,
-  exitDuration: 300,
-  isActive: false,
-  name: 'fadeIn',
-  unmountOnExit: true
-}; // Animation.propTypesDescription = {
-//   name: ' ',
-//   children: ' ',
-//   enterDuration: ' ',
-//   exitDuration: ' ',
-//   isActive: ' '
-// };
+Animation.propTypes = propTypes;
+Animation.defaultProps = defaultProps;
 
 if (false) {
   Animation.docs = {

package/es/Animation/props/defaultProps.js

@@ -0,0 +1,7 @@
+export const defaultProps = {
+  enterDuration: 300,
+  exitDuration: 300,
+  isActive: false,
+  name: 'fadeIn',
+  unmountOnExit: true
+};

package/es/Animation/props/propTypes.js

@@ -0,0 +1,12 @@
+import PropTypes from 'prop-types';
+export const propTypes = {
+  children: PropTypes.node,
+  delayClassName: PropTypes.string,
+  enterDuration: PropTypes.number,
+  exitDuration: PropTypes.number,
+  isActive: PropTypes.bool,
+  name: PropTypes.oneOf(['zoomIn', 'scaleIn', 'fadeIn', 'slideLeft', 'slideDown', 'skewIn', 'default', 'none']),
+  onEntered: PropTypes.func,
+  onExit: PropTypes.func,
+  unmountOnExit: PropTypes.bool
+};

package/es/AppContainer/AppContainer.js

@@ -1,7 +1,8 @@
-function _extends() { _extends = Object.assign ? Object.assign.bind() : 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); }
+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); }
 
 import React from 'react';
-import PropTypes from 'prop-types';
+import { defaultProps } from './props/defaultProps';
+import { propTypes } from './props/propTypes';
 import { Container, Box } from '../Layout';
 import Tooltip from '../Tooltip/Tooltip';
 import '../common/basic.module.css';
@@ -110,28 +111,8 @@ export default class AppContainer extends React.Component {
   }
 
 }
-AppContainer.propTypes = {
-  children: PropTypes.oneOfType([PropTypes.element, PropTypes.arrayOf(PropTypes.element)]),
-  dataId: PropTypes.string,
-  eleRef: PropTypes.func,
-  tagName: PropTypes.string,
-  className: PropTypes.string,
-  tooltipClass: PropTypes.string,
-  tooltipParentClass: PropTypes.string,
-  customProps: PropTypes.shape({
-    ContainerProps: PropTypes.object,
-    TooltipProps: PropTypes.object,
-    ExtraProps: PropTypes.object
-  })
-};
-AppContainer.defaultProps = {
-  dataId: 'AppContainer',
-  tagName: 'div',
-  className: '',
-  tooltipClass: '',
-  tooltipParentClass: '',
-  customProps: {}
-};
+AppContainer.propTypes = propTypes;
+AppContainer.defaultProps = defaultProps;
 
 if (false) {
   AppContainer.docs = {

package/es/AppContainer/props/defaultProps.js

@@ -0,0 +1,8 @@
+export const defaultProps = {
+  dataId: 'AppContainer',
+  tagName: 'div',
+  className: '',
+  tooltipClass: '',
+  tooltipParentClass: '',
+  customProps: {}
+};

package/es/AppContainer/props/propTypes.js

@@ -0,0 +1,15 @@
+import PropTypes from 'prop-types';
+export const propTypes = {
+  children: PropTypes.oneOfType([PropTypes.element, PropTypes.arrayOf(PropTypes.element)]),
+  dataId: PropTypes.string,
+  eleRef: PropTypes.func,
+  tagName: PropTypes.string,
+  className: PropTypes.string,
+  tooltipClass: PropTypes.string,
+  tooltipParentClass: PropTypes.string,
+  customProps: PropTypes.shape({
+    ContainerProps: PropTypes.object,
+    TooltipProps: PropTypes.object,
+    ExtraProps: PropTypes.object
+  })
+};

package/es/Avatar/Avatar.js

@@ -1,7 +1,8 @@
-function _extends() { _extends = Object.assign ? Object.assign.bind() : 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); }
+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); }
 
 import React from 'react';
-import PropTypes from 'prop-types';
+import { defaultProps } from './props/defaultProps';
+import { propTypes } from './props/propTypes';
 import { getInitial } from '../utils/getInitial';
 import AvatarSize from '../Provider/AvatarSize';
 import style from './Avatar.module.css';
@@ -164,49 +165,8 @@ export default class Avatar extends React.Component {
   }
 
 }
-Avatar.defaultProps = {
-  needTitle: true,
-  palette: 'primary',
-  shape: 'circle',
-  size: 'medium',
-  src: null,
-  title: null,
-  dataId: 'Avatar',
-  needBorder: true,
-  borderOnActive: false,
-  borderOnHover: false,
-  customProps: {}
-};
-Avatar.propTypes = {
-  dataId: PropTypes.string,
-  initial: PropTypes.string,
-  name: PropTypes.string.isRequired,
-  needBorder: PropTypes.bool,
-  needTitle: PropTypes.bool,
-  onClick: PropTypes.func,
-  palette: PropTypes.oneOf(['primary', 'secondary', 'info', 'default']),
-  shape: PropTypes.oneOf(['circle', 'square']),
-  size: PropTypes.oneOf(['small', 'xsmall', 'medium', 'xmedium', 'large', 'xlarge']),
-  src: PropTypes.string,
-  textPalette: PropTypes.oneOf(['white', 'black']),
-  title: PropTypes.string,
-  customClass: PropTypes.string,
-  alternateSrc: PropTypes.string,
-  borderOnActive: PropTypes.bool,
-  borderOnHover: PropTypes.bool,
-  customProps: PropTypes.shape({
-    AvatarProps: PropTypes.object
-  })
-}; // Avatar.propTypesDescription = {
-//   name: ' ',
-//   size: ' ',
-//   src: ' ',
-//   palette: ' ',
-//   onClick: ' ',
-//   shape: ' ',
-//   title: ' '
-// };
-
+Avatar.defaultProps = defaultProps;
+Avatar.propTypes = propTypes;
 Avatar.invalidImageURLs = [];
 Avatar.validImageURLs = [];
 

package/es/Avatar/Avatar.module.css

@@ -17,17 +17,19 @@
   composes: dInflex alignVertical alignHorizontal from '../common/common.module.css';
   vertical-align: middle;
   font-size: var(--avatar_font_size);
-  color: var(--avatar_text_color);
   border-width: var(--avatar_border_width);
   border-style: var(--avatar_border_style);
+  color: var(--avatar_text_color);
 }
 .border {
   border-color: var(--avatar_border_color);
 }
-.borderOnHover:hover, .borderOnActive {
+.borderOnHover:hover,
+.borderOnActive {
   border-color: var(--avatar_border_hoverColor);
 }
-.avatar, .primary {
+.avatar,
+.primary {
   background-color: var(--avatar_bg_color);
 }
 .shadow {
@@ -35,31 +37,27 @@
   height: 100%;
   width: 100%;
   top: 0;
+  left: 0;
   pointer-events: none;
   border-radius: var(--avatar_border_radius);
 }
-[dir=ltr] .shadow {
-  left: 0;
-}
-[dir=rtl] .shadow {
-  right: 0;
-}
 .shadow.black {
   box-shadow: inset 0px 0px 5px var(--avatar_boxshadow);
 }
 .shadow.white {
   box-shadow: inset 0px 0px 11px var(--avatar_boxshadow);
 }
-.avatar, .circle {
+.avatar,
+.circle {
   border-radius: var(--avatar_border_radius);
 }
 .border {
   --avatar_border_width: 1px;
 }
 .image {
+  border-radius: var(--avatar_border_radius);
   width: 100%;
   height: 100%;
-  border-radius: var(--avatar_border_radius);
 }
 .square_small {
   --avatar_border_radius: 4px;

package/es/Avatar/props/defaultProps.js

@@ -0,0 +1,13 @@
+export const defaultProps = {
+  needTitle: true,
+  palette: 'primary',
+  shape: 'circle',
+  size: 'medium',
+  src: null,
+  title: null,
+  dataId: 'Avatar',
+  needBorder: true,
+  borderOnActive: false,
+  borderOnHover: false,
+  customProps: {}
+};

package/es/Avatar/props/propTypes.js

@@ -0,0 +1,22 @@
+import PropTypes from 'prop-types';
+export const propTypes = {
+  dataId: PropTypes.string,
+  initial: PropTypes.string,
+  name: PropTypes.string.isRequired,
+  needBorder: PropTypes.bool,
+  needTitle: PropTypes.bool,
+  onClick: PropTypes.func,
+  palette: PropTypes.oneOf(['primary', 'secondary', 'info', 'default']),
+  shape: PropTypes.oneOf(['circle', 'square']),
+  size: PropTypes.oneOf(['small', 'xsmall', 'medium', 'xmedium', 'large', 'xlarge']),
+  src: PropTypes.string,
+  textPalette: PropTypes.oneOf(['white', 'black']),
+  title: PropTypes.string,
+  customClass: PropTypes.string,
+  alternateSrc: PropTypes.string,
+  borderOnActive: PropTypes.bool,
+  borderOnHover: PropTypes.bool,
+  customProps: PropTypes.shape({
+    AvatarProps: PropTypes.object
+  })
+};

package/es/AvatarTeam/AvatarTeam.js

@@ -1,7 +1,8 @@
-function _extends() { _extends = Object.assign ? Object.assign.bind() : 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); }
+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); }
 
 import React from 'react';
-import PropTypes from 'prop-types';
+import { defaultProps } from './props/defaultProps';
+import { propTypes } from './props/propTypes';
 import Avatar from '../Avatar/Avatar';
 import style from './AvatarTeam.module.css';
 /* once avatar support firstname lastname and pattern
@@ -64,41 +65,8 @@ export default class AvatarTeam extends React.Component {
   }
 
 }
-AvatarTeam.defaultProps = {
-  isFilled: false,
-  palette: 'primary',
-  size: 'medium',
-  src: null,
-  title: null,
-  dataId: 'avatarTeamComp',
-  needTitle: true,
-  customClass: {},
-  borderOnActive: false,
-  borderOnHover: false,
-  customProps: {}
-};
-AvatarTeam.propTypes = {
-  dataId: PropTypes.string,
-  isFilled: PropTypes.bool,
-  name: PropTypes.string.isRequired,
-  needTitle: PropTypes.bool,
-  onClick: PropTypes.func,
-  palette: PropTypes.oneOf(['primary', 'secondary', 'info']),
-  size: PropTypes.oneOf(['small', 'xsmall', 'medium', 'xmedium', 'large', 'xlarge']),
-  src: PropTypes.string,
-  textPalette: PropTypes.oneOf(['white', 'black']),
-  title: PropTypes.string,
-  customClass: PropTypes.shape({
-    customAvatar: PropTypes.string,
-    customAvatarTeam: PropTypes.string
-  }),
-  borderOnActive: PropTypes.bool,
-  borderOnHover: PropTypes.bool,
-  customProps: PropTypes.shape({
-    AvatarTeamProps: PropTypes.object,
-    AvatarProps: PropTypes.object
-  })
-};
+AvatarTeam.defaultProps = defaultProps;
+AvatarTeam.propTypes = propTypes;
 
 if (false) {
   AvatarTeam.docs = {

package/es/AvatarTeam/AvatarTeam.module.css

@@ -20,23 +20,17 @@
 .team {
   composes: varClass;
   composes: posab from '../common/common.module.css';
+  transform: translate(-50%, -50%);
+  left: 50%;
   top: var(--avatarteam_top_top);
-  width: var(--avatarteam_width);
-  height: var(--avatarteam_height);
   border-width: var(--avatarteam_border_width);
   border-style: var(--avatarteam_border_style);
   border-color: var(--avatarteam_border_color);
   background-color: var(--avatarteam_bg_color);
+  width: var(--avatarteam_width);
+  height: var(--avatarteam_height);
   border-radius: var(--avatarteam_border_radius);
 }
-[dir=ltr] .team {
-  transform: translate(-50%, -50%);
-  left: 50%;
-}
-[dir=rtl] .team {
-  transform: translate(50%, -50%);
-  right: 50%;
-}
 .nofill {
   --avatarteam_border_color: var(--zdt_avatarteam_nofill_border);
 }
@@ -61,24 +55,16 @@
 .team:before {
   position: absolute;
   content: '';
-  height: inherit;
-  width: inherit;
-  top: var(--avatarteam_bottom_top);
-}
-.team:after, .team:before {
   border: inherit;
   background-color: inherit;
   border-radius: inherit;
+  height: inherit;
+  width: inherit;
   box-shadow: inherit;
-}
-[dir=ltr] .team:after, [dir=ltr] .team:before {
+  top: var(--avatarteam_bottom_top);
   left: var(--avatarteam_bottom_left);
   right: var(--avatarteam_bottom_right);
 }
-[dir=rtl] .team:after, [dir=rtl] .team:before {
-  right: var(--avatarteam_bottom_left);
-  left: var(--avatarteam_bottom_right);
-}
 .smallteam,
 .xsmallteam {
   --avatarteam_height: var(--zd_size3);

package/es/AvatarTeam/props/defaultProps.js

@@ -0,0 +1,13 @@
+export const defaultProps = {
+  isFilled: false,
+  palette: 'primary',
+  size: 'medium',
+  src: null,
+  title: null,
+  dataId: 'avatarTeamComp',
+  needTitle: true,
+  customClass: {},
+  borderOnActive: false,
+  borderOnHover: false,
+  customProps: {}
+};

package/es/AvatarTeam/props/propTypes.js

@@ -0,0 +1,23 @@
+import PropTypes from 'prop-types';
+export const propTypes = {
+  dataId: PropTypes.string,
+  isFilled: PropTypes.bool,
+  name: PropTypes.string.isRequired,
+  needTitle: PropTypes.bool,
+  onClick: PropTypes.func,
+  palette: PropTypes.oneOf(['primary', 'secondary', 'info']),
+  size: PropTypes.oneOf(['small', 'xsmall', 'medium', 'xmedium', 'large', 'xlarge']),
+  src: PropTypes.string,
+  textPalette: PropTypes.oneOf(['white', 'black']),
+  title: PropTypes.string,
+  customClass: PropTypes.shape({
+    customAvatar: PropTypes.string,
+    customAvatarTeam: PropTypes.string
+  }),
+  borderOnActive: PropTypes.bool,
+  borderOnHover: PropTypes.bool,
+  customProps: PropTypes.shape({
+    AvatarTeamProps: PropTypes.object,
+    AvatarProps: PropTypes.object
+  })
+};