@ausbom/accordion 0.6.17 → 0.7.0

package/lib/components/AccordionHeader/AccordionHeader.d.ts

@@ -10,6 +10,7 @@ export interface IProps {
   title?: React.ReactNode
   subTitle?: string
   dark?: boolean
+  headerWrapper?: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6'
 }
 
 export default class extends React.PureComponent<IProps> {

package/lib/components/AccordionHeader/AccordionHeader.js

@@ -1 +1 @@
-"use strict";var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports["default"]=void 0;var _extends2=_interopRequireDefault(require("@babel/runtime/helpers/extends"));var _objectWithoutProperties2=_interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));var _classCallCheck2=_interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));var _createClass2=_interopRequireDefault(require("@babel/runtime/helpers/createClass"));var _inherits2=_interopRequireDefault(require("@babel/runtime/helpers/inherits"));var _possibleConstructorReturn2=_interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));var _getPrototypeOf2=_interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));var _defineProperty2=_interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));var _icon=require("@ausbom/icon");var _ChevronDown=_interopRequireDefault(require("@ausbom/icon/lib/icons/system/ChevronDown16"));var _ChevronDown2=_interopRequireDefault(require("@ausbom/icon/lib/icons/system/ChevronDown24"));var _ChevronUp=_interopRequireDefault(require("@ausbom/icon/lib/icons/system/ChevronUp16"));var _ChevronUp2=_interopRequireDefault(require("@ausbom/icon/lib/icons/system/ChevronUp24"));var _classnames=_interopRequireDefault(require("classnames"));var _react=_interopRequireDefault(require("react"));function _createSuper(Derived){var hasNativeReflectConstruct=_isNativeReflectConstruct();return function _createSuperInternal(){var Super=(0,_getPrototypeOf2["default"])(Derived),result;if(hasNativeReflectConstruct){var NewTarget=(0,_getPrototypeOf2["default"])(this).constructor;result=Reflect.construct(Super,arguments,NewTarget)}else{result=Super.apply(this,arguments)}return(0,_possibleConstructorReturn2["default"])(this,result)}}function _isNativeReflectConstruct(){if(typeof Reflect==="undefined"||!Reflect.construct)return false;if(Reflect.construct.sham)return false;if(typeof Proxy==="function")return true;try{Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}));return true}catch(e){return false}}var AccordionHeader=/*#__PURE__*/function(_React$PureComponent){(0,_inherits2["default"])(AccordionHeader,_React$PureComponent);var _super=_createSuper(AccordionHeader);function AccordionHeader(){(0,_classCallCheck2["default"])(this,AccordionHeader);return _super.apply(this,arguments)}(0,_createClass2["default"])(AccordionHeader,[{key:"render",value:function render(){var _ref=this.props,className=_ref.className,isOpen=_ref.isOpen,title=_ref.title,subTitle=_ref.subTitle,dark=_ref.dark,innerRef=_ref.innerRef,rest=(0,_objectWithoutProperties2["default"])(_ref,["className","isOpen","title","subTitle","dark","innerRef"]);var classes=(0,_classnames["default"])(className,"bom-accordion-header",{"bom-accordion-header--open":isOpen,"bom-accordion-header--text-only":typeof title==="string","bom-accordion-header--dark":dark});return/*#__PURE__*/_react["default"].createElement("button",(0,_extends2["default"])({ref:innerRef,className:classes,type:"button"},rest),/*#__PURE__*/_react["default"].createElement("span",{className:"bom-accordion-header__label"},title,subTitle&&/*#__PURE__*/_react["default"].createElement("span",{className:"bom-accordion-sub-header__label"},subTitle)),/*#__PURE__*/_react["default"].createElement("span",{className:"bom-accordion-header__caret"},/*#__PURE__*/_react["default"].createElement(_icon.SystemIcon,{"aria-hidden":true,icon:isOpen?_ChevronUp["default"]:_ChevronDown["default"],size:16})),/*#__PURE__*/_react["default"].createElement("span",{className:"bom-accordion-header__caret bom-accordion-header__caret--desktop"},/*#__PURE__*/_react["default"].createElement(_icon.SystemIcon,{"aria-hidden":true,icon:isOpen?_ChevronUp2["default"]:_ChevronDown2["default"],size:24})))}}]);return AccordionHeader}(_react["default"].PureComponent);(0,_defineProperty2["default"])(AccordionHeader,"defaultProps",{dark:false});var AccordionHeaderWithRef=/*#__PURE__*/_react["default"].forwardRef(function(props,ref){return/*#__PURE__*/_react["default"].createElement(AccordionHeader,(0,_extends2["default"])({innerRef:ref},props))});AccordionHeaderWithRef.displayName="AccordionHeader";var _default=AccordionHeaderWithRef;exports["default"]=_default;
+"use strict";var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports["default"]=void 0;var _extends2=_interopRequireDefault(require("@babel/runtime/helpers/extends"));var _objectWithoutProperties2=_interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));var _classCallCheck2=_interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));var _createClass2=_interopRequireDefault(require("@babel/runtime/helpers/createClass"));var _inherits2=_interopRequireDefault(require("@babel/runtime/helpers/inherits"));var _possibleConstructorReturn2=_interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));var _getPrototypeOf2=_interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));var _defineProperty2=_interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));var _typography=_interopRequireDefault(require("@ausbom/typography"));var _icon=require("@ausbom/icon");var _ChevronDown=_interopRequireDefault(require("@ausbom/icon/lib/icons/system/ChevronDown16"));var _ChevronDown2=_interopRequireDefault(require("@ausbom/icon/lib/icons/system/ChevronDown24"));var _ChevronUp=_interopRequireDefault(require("@ausbom/icon/lib/icons/system/ChevronUp16"));var _ChevronUp2=_interopRequireDefault(require("@ausbom/icon/lib/icons/system/ChevronUp24"));var _classnames=_interopRequireDefault(require("classnames"));var _react=_interopRequireDefault(require("react"));function _createSuper(Derived){var hasNativeReflectConstruct=_isNativeReflectConstruct();return function _createSuperInternal(){var Super=(0,_getPrototypeOf2["default"])(Derived),result;if(hasNativeReflectConstruct){var NewTarget=(0,_getPrototypeOf2["default"])(this).constructor;result=Reflect.construct(Super,arguments,NewTarget)}else{result=Super.apply(this,arguments)}return(0,_possibleConstructorReturn2["default"])(this,result)}}function _isNativeReflectConstruct(){if(typeof Reflect==="undefined"||!Reflect.construct)return false;if(Reflect.construct.sham)return false;if(typeof Proxy==="function")return true;try{Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}));return true}catch(e){return false}}var AccordionHeader=/*#__PURE__*/function(_React$PureComponent){(0,_inherits2["default"])(AccordionHeader,_React$PureComponent);var _super=_createSuper(AccordionHeader);function AccordionHeader(){(0,_classCallCheck2["default"])(this,AccordionHeader);return _super.apply(this,arguments)}(0,_createClass2["default"])(AccordionHeader,[{key:"render",value:function render(){var _ref=this.props,className=_ref.className,isOpen=_ref.isOpen,title=_ref.title,subTitle=_ref.subTitle,dark=_ref.dark,innerRef=_ref.innerRef,rest=(0,_objectWithoutProperties2["default"])(_ref,["className","isOpen","title","subTitle","dark","innerRef"]);var classes=(0,_classnames["default"])(className,"bom-accordion-header",{"bom-accordion-header--open":isOpen,"bom-accordion-header--text-only":typeof title==="string","bom-accordion-header--dark":dark});return/*#__PURE__*/_react["default"].createElement("button",(0,_extends2["default"])({ref:innerRef,className:classes,type:"button"},rest),/*#__PURE__*/_react["default"].createElement("span",{className:"bom-accordion-header__label"},title,subTitle&&/*#__PURE__*/_react["default"].createElement("span",{className:"bom-accordion-sub-header__label"},subTitle)),/*#__PURE__*/_react["default"].createElement("span",{className:"bom-accordion-header__caret"},/*#__PURE__*/_react["default"].createElement(_icon.SystemIcon,{"aria-hidden":true,icon:isOpen?_ChevronUp["default"]:_ChevronDown["default"],size:16})),/*#__PURE__*/_react["default"].createElement("span",{className:"bom-accordion-header__caret bom-accordion-header__caret--desktop"},/*#__PURE__*/_react["default"].createElement(_icon.SystemIcon,{"aria-hidden":true,icon:isOpen?_ChevronUp2["default"]:_ChevronDown2["default"],size:24})))}}]);return AccordionHeader}(_react["default"].PureComponent);(0,_defineProperty2["default"])(AccordionHeader,"defaultProps",{dark:false});var AccordionHeaderWithRef=/*#__PURE__*/_react["default"].forwardRef(function(props,ref){var headerWrapper=props.headerWrapper,isOpen=props.isOpen;if(headerWrapper){var headerWrapperClasses=(0,_classnames["default"])("bom-accordion-header__wrapper",{"bom-accordion-header__wrapper--open":isOpen});return/*#__PURE__*/_react["default"].createElement(_typography["default"],{as:headerWrapper,styleName:"body",className:headerWrapperClasses,isResponsive:true},/*#__PURE__*/_react["default"].createElement(AccordionHeader,(0,_extends2["default"])({innerRef:ref},props)))}return/*#__PURE__*/_react["default"].createElement(AccordionHeader,(0,_extends2["default"])({innerRef:ref},props))});AccordionHeaderWithRef.displayName="AccordionHeader";var _default=AccordionHeaderWithRef;exports["default"]=_default;

package/lib/components/AccordionItem/AccordionItem.d.ts

@@ -11,6 +11,7 @@ export interface IProps {
   subTitle?: string
   title: ((isOpen: boolean) => React.ReactNode) | React.ReactNode
   panelWrapper?: React.ReactNode
+  headerWrapper?: 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6'
 }
 
 export default class extends React.PureComponent<IProps> {

package/lib/components/AccordionItem/AccordionItem.js

@@ -1,2 +1,2 @@
 "use strict";var _interopRequireDefault=require("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(exports,"__esModule",{value:true});exports["default"]=void 0;var _extends2=_interopRequireDefault(require("@babel/runtime/helpers/extends"));var _objectWithoutProperties2=_interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));var _classCallCheck2=_interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));var _createClass2=_interopRequireDefault(require("@babel/runtime/helpers/createClass"));var _inherits2=_interopRequireDefault(require("@babel/runtime/helpers/inherits"));var _possibleConstructorReturn2=_interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));var _getPrototypeOf2=_interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));var _defineProperty2=_interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));var _react=_interopRequireDefault(require("react"));var _body=_interopRequireDefault(require("@ausbom/body"));var _ExpandCollapse=_interopRequireDefault(require("../../utils/ExpandCollapse"));var _AccordionPanel=_interopRequireDefault(require("../AccordionPanel/AccordionPanel"));var _AccordionHeader=_interopRequireDefault(require("../AccordionHeader/AccordionHeader"));function _createSuper(Derived){var hasNativeReflectConstruct=_isNativeReflectConstruct();return function _createSuperInternal(){var Super=(0,_getPrototypeOf2["default"])(Derived),result;if(hasNativeReflectConstruct){var NewTarget=(0,_getPrototypeOf2["default"])(this).constructor;result=Reflect.construct(Super,arguments,NewTarget)}else{result=Super.apply(this,arguments)}return(0,_possibleConstructorReturn2["default"])(this,result)}}function _isNativeReflectConstruct(){if(typeof Reflect==="undefined"||!Reflect.construct)return false;if(Reflect.construct.sham)return false;if(typeof Proxy==="function")return true;try{Boolean.prototype.valueOf.call(Reflect.construct(Boolean,[],function(){}));return true}catch(e){return false}}var AccordionItem=/*#__PURE__*/function(_React$PureComponent){(0,_inherits2["default"])(AccordionItem,_React$PureComponent);var _super=_createSuper(AccordionItem);function AccordionItem(){(0,_classCallCheck2["default"])(this,AccordionItem);return _super.apply(this,arguments)}(0,_createClass2["default"])(AccordionItem,[{key:"renderTitle",value:// eslint-disable-next-line class-methods-use-this
-function renderTitle(title,open){var renderedTitle=title;if(typeof title==="function"){renderedTitle=title(open)}return renderedTitle}},{key:"render",value:function render(){var _this=this;var _ref=this.props,children=_ref.children,id=_ref.id,isOpen=_ref.isOpen,_onClick=_ref.onClick,title=_ref.title,subTitle=_ref.subTitle,dark=_ref.dark,panelWrapper=_ref.panelWrapper,rest=(0,_objectWithoutProperties2["default"])(_ref,["children","id","isOpen","onClick","title","subTitle","dark","panelWrapper"]);return/*#__PURE__*/_react["default"].createElement(_ExpandCollapse["default"],{panelId:id,isOpen:isOpen},function(_ref2){var getTriggerProps=_ref2.getTriggerProps,getPanelProps=_ref2.getPanelProps;return/*#__PURE__*/_react["default"].createElement(_react["default"].Fragment,null,/*#__PURE__*/_react["default"].createElement(_AccordionHeader["default"],(0,_extends2["default"])({isOpen:isOpen,dark:dark,title:_this.renderTitle(title,isOpen),subTitle:subTitle},getTriggerProps({onClick:function onClick(evt){if(_onClick){_onClick(evt,id)}}}),rest)),/*#__PURE__*/_react["default"].createElement(_AccordionPanel["default"],(0,_extends2["default"])({dark:dark,isOpen:isOpen,wrapper:panelWrapper},getPanelProps({id:id})),children))})}}]);return AccordionItem}(_react["default"].PureComponent);(0,_defineProperty2["default"])(AccordionItem,"defaultProps",{dark:false,isOpen:false,panelWrapper:_body["default"]});var _default=AccordionItem;exports["default"]=_default;
+function renderTitle(title,open){var renderedTitle=title;if(typeof title==="function"){renderedTitle=title(open)}return renderedTitle}},{key:"render",value:function render(){var _this=this;var _ref=this.props,children=_ref.children,id=_ref.id,isOpen=_ref.isOpen,_onClick=_ref.onClick,title=_ref.title,subTitle=_ref.subTitle,dark=_ref.dark,panelWrapper=_ref.panelWrapper,headerWrapper=_ref.headerWrapper,rest=(0,_objectWithoutProperties2["default"])(_ref,["children","id","isOpen","onClick","title","subTitle","dark","panelWrapper","headerWrapper"]);return/*#__PURE__*/_react["default"].createElement(_ExpandCollapse["default"],{panelId:id,isOpen:isOpen},function(_ref2){var getTriggerProps=_ref2.getTriggerProps,getPanelProps=_ref2.getPanelProps;return/*#__PURE__*/_react["default"].createElement(_react["default"].Fragment,null,/*#__PURE__*/_react["default"].createElement(_AccordionHeader["default"],(0,_extends2["default"])({isOpen:isOpen,dark:dark,title:_this.renderTitle(title,isOpen),headerWrapper:headerWrapper,subTitle:subTitle},getTriggerProps({onClick:function onClick(evt){if(_onClick){_onClick(evt,id)}}}),rest)),/*#__PURE__*/_react["default"].createElement(_AccordionPanel["default"],(0,_extends2["default"])({dark:dark,isOpen:isOpen,wrapper:panelWrapper},getPanelProps({id:id})),children))})}}]);return AccordionItem}(_react["default"].PureComponent);(0,_defineProperty2["default"])(AccordionItem,"defaultProps",{dark:false,isOpen:false,panelWrapper:_body["default"]});var _default=AccordionItem;exports["default"]=_default;

package/lib/scss/module.scss

@@ -4,6 +4,40 @@
 
 .bom-accordion {
   width: 100%;
+
+  .bom-accordion-header {
+    border-bottom: none;
+  }
+
+  .bom-accordion-header:last-of-type {
+    &:not(.bom-accordion-header--open) {
+      border-bottom: 1px solid map-get($bom-accordion, borderColor);
+    }
+
+    &.bom-accordion-header--dark {
+      &:not(.bom-accordion-header--open) {
+        border-bottom-color: scale-color(get-palette-color('neutral.white'), $alpha: -35%);
+      }
+    }
+  }
+
+  .bom-accordion-header__wrapper:last-of-type {
+    .bom-accordion-header {
+      &:not(.bom-accordion-header--open) {
+        border-bottom: 1px solid map-get($bom-accordion, borderColor);
+      }
+
+      &--dark {
+        border-bottom-color: scale-color(get-palette-color('neutral.white'), $alpha: -35%);
+      }
+    }
+  }
+
+  .bom-accordion-header__wrapper:not(:last-of-type) {
+    .bom-accordion-header {
+      border-bottom: none;
+    }
+  }
 }
 
 .bom-accordion-header {
@@ -17,12 +51,6 @@
   width: 100%;
   padding: 0;
 
-  &:last-of-type {
-    &:not(.bom-accordion-header--open) {
-      border-bottom: 1px solid map-get($bom-accordion, borderColor);
-    }
-  }
-
   &.bom-accordion-header--open {
     border-top-color: get-palette-color('primary.electricBlue');
 
@@ -58,11 +86,11 @@
 
 .bom-accordion-header--dark {
   color: get-palette-color('neutral.white');
-  border-top: 1px solid scale-color(get-palette-color('neutral.white'), $alpha: -35%);
+  border-color: scale-color(get-palette-color('neutral.white'), $alpha: -35%);
 
   &:last-of-type {
     &:not(.bom-accordion-header--open) {
-      border-bottom: 1px solid scale-color(get-palette-color('neutral.white'), $alpha: -35%);
+      border-color: scale-color(get-palette-color('neutral.white'), $alpha: -35%);
     }
   }
 
@@ -129,8 +157,16 @@
 
 .bom-accordion-panel--open {
   display: block;
-  border-bottom: 1px solid get-palette-color('primary.electricBlue');
+  border-color: get-palette-color('primary.electricBlue');
   padding-bottom: 20px;
+  border-bottom: 1px solid get-palette-color('primary.electricBlue');
+
+  + .bom-accordion-header,
+  + .bom-accordion-header__wrapper {
+    .bom-accordion-header {
+      border: none;
+    }
+  }
 }
 
 .bom-accordion-panel--dark {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ausbom/accordion",
-  "version": "0.6.17",
+  "version": "0.7.0",
   "description": "",
   "keywords": [],
   "author": "",
@@ -39,7 +39,8 @@
   "dependencies": {
     "@ausbom/body": "^0.3.8",
     "@ausbom/icon": "^0.19.1",
-    "@ausbom/styles": "^0.12.0"
+    "@ausbom/styles": "^0.12.0",
+    "@ausbom/typography": "0.4.3"
   },
-  "gitHead": "7f762808b0e4ea8c9c20c400d1883f1cb845658a"
+  "gitHead": "8c140a9ca07857700ad1d420b71192bf85fd90c6"
 }