Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
# Changelog

### 6.3.9 (2022-11-02)

- [885](https://github.com/influxdata/clockface/pull/885): (MultiSelect): make MultiSelectDropdown optionally searchable through `isSearchable` prop

### 6.3.8 (2022-10-04)

- [857](https://github.com/influxdata/clockface/pull/857): (TimeInput): Fix the dropdown button width to accomodate for multi-character units
Expand DownExpand Up@@ -39,6 +43,7 @@
### 6.2.0 (2022-08-24)

- [814](https://github.com/influxdata/clockface/pull/814): Added Collapse functionality to the Draggable Resizer

### 6.1.1 (2022-08-17)

- [823](https://github.com/influxdata/clockface/pull/823): Typeahead Dropdown select text on focus works on all browsers
Expand All@@ -55,7 +60,6 @@

- [804](https://github.com/influxdata/clockface/pull/804): Add DoubleCaretVertical icon and trailingIcon prop to Dropdown.Button


### 6.0.0 (2022-08-01)

- [812](https://github.com/influxdata/clockface/pull/812): Remove unused MenuDropdown code
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@influxdata/clockface",
"version": "6.3.8",
"version": "6.3.9",
"license": "MIT",
"main": "dist/index.js",
"style": "dist/index.css",
Expand Down
11 changes: 7 additions & 4 deletions src/Components/Accordion/Accordion.scss
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@

.cf-accordion--icon-container {
position: relative;
// min-width: $cf-space-s;
}

.cf-accordion--icon-container-left {
Expand DownExpand Up@@ -40,7 +39,7 @@
width: 100%;
min-height: $cf-form-lg-height;
border-radius: $cf-radius;
background-color: $cf-grey-25;
background-color: $cf-grey-3;
align-items: center;
outline: none;
padding: $cf-space-s;
Expand DownExpand Up@@ -74,6 +73,10 @@

.cf-accordion--header--content {
width: 100%;

&--no-body {
margin-left: 25px;
}
}

.cf-accordion--body--disabled,
Expand DownExpand Up@@ -115,11 +118,11 @@
@extend .cf-accordion--header;
min-height: $cf-form-md-height;
padding: $cf-form-md-padding;
background-color: $cf-grey-15;
background-color: $cf-grey-2;
border-radius: 0px;

&:hover {
background-color: $cf-grey-15;
background-color: $cf-dark-lavender;
}
}

Expand Down
14 changes: 2 additions & 12 deletions src/Components/Accordion/Accordion.tsx
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
// Libraries
import React, {forwardRef, useState, useEffect} from 'react'
import React, {forwardRef, useEffect, useState} from 'react'
import classnames from 'classnames'
// Styles
import './Accordion.scss'
// Types
import {Direction, StandardFunctionProps} from '../../Types'

export interface AccordionProps extends StandardFunctionProps {
/** Determines whether the expand Icon is at the left, right or doesn't exist. If there is no accordionBody, no icons are shown*/
iconPlacement?: Direction
/** Determines whether the accordion is expanded by default or not */
expanded?: boolean
/** Prevents any interaction with this element, including the onClick function */
Expand DownExpand Up@@ -46,7 +44,6 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
style,
testID = 'accordion',
children,
iconPlacement = Direction.Left,
className,
expanded = false,
disabled = false,
Expand All@@ -61,9 +58,6 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
const [isExpanded, setExpanded] = useState(expanded)
const [animation, setAnimation] = useState(false)
const [isDisabled, setDisabled] = useState(disabled)
const [iconPlacementPosition, setIconPlacementPosition] = useState(
iconPlacement
)

useEffect(() => {
setExpanded(expanded)
Expand All@@ -79,10 +73,6 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
}
}, [isExpanded])

useEffect(() => {
setIconPlacementPosition(iconPlacement)
}, [iconPlacement])

const accordionBodyContainerClassName = classnames(
'cf-accordion--body-container',
{
Expand All@@ -106,7 +96,7 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
const contextState = {
isExpanded,
setExpanded,
iconPlacementPosition: hasBody ? iconPlacementPosition : Direction.None,
iconPlacementPosition: hasBody ? Direction.Left : Direction.None,
isDisabled,
onChange: onChangeFunction,
hasBody: hasBody,
Expand Down
29 changes: 9 additions & 20 deletions src/Components/Accordion/AccordionHeader.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,13 @@ export const AccordionHeader = forwardRef<
[`cf-accordion--header--clickable`]: context.hasBody && !context.isDisabled,
})

const AccordionHeaderContentClassName = classnames(
'cf-accordion--header--content',
{
['cf-accordion--header--content--no-body']: !context.hasBody,
}
)

const toggleExpand = () => {
if (!context.isDisabled) {
context.setExpanded(!context.isExpanded)
Expand All@@ -59,28 +66,10 @@ export const AccordionHeader = forwardRef<
'cf-accordion--icon-container cf-accordion--icon-container-left'
}
>
<Icon
glyph={IconFont.CaretDown_New}
className={AccordionHeaderCaretClassName}
/>
</div>
)}
<div className={'cf-accordion--header--content'}>{children}</div>
{context.iconPlacementPosition === Direction.Right && (
<div
onClick={() => {
context.setExpanded(!context.isExpanded)
}}
className={
'cf-accordion--icon-container cf-accordion--icon-container-right'
}
>
<Icon
glyph={IconFont.CaretDown_New}
className={AccordionHeaderCaretClassName}
/>
<Icon glyph={caretIcon} className={AccordionHeaderCaretClassName} />
</div>
)}
<div className={AccordionHeaderContentClassName}>{children}</div>
</button>
)
})
Expand Down
43 changes: 17 additions & 26 deletions src/Components/Accordion/Documentation/Accordion.stories.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import marked from 'marked'

// Storybook
import {storiesOf} from '@storybook/react'
import {boolean, object, select, withKnobs} from '@storybook/addon-knobs'
import {boolean, object, withKnobs} from '@storybook/addon-knobs'

// Components
import {Accordion, AccordionRef} from '../'
Expand All@@ -18,14 +18,12 @@ import {
AlignItems,
ComponentSize,
FlexDirection,
Direction,
InputToggleType,
JustifyContent,
HeadingElement,
} from '../../../Types'
import {FlexBox} from '../../FlexBox'
import {AccordionBodyItem} from '../AccordionBodyItem'
import {mapEnumKeys} from '../../../Utils/storybook'
import {Heading} from '../../Typography'

const accordionStories = storiesOf(
Expand DownExpand Up@@ -283,9 +281,6 @@ accordionStories.add(
style={{justifyContent: 'none', alignItems: 'start', display: 'block'}}
>
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand DownExpand Up@@ -328,9 +323,6 @@ accordionStories.add(
</Accordion.AccordionBodyItem>
</Accordion>
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand DownExpand Up@@ -399,9 +391,6 @@ accordionStories.add(
>
{' '}
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand All@@ -411,9 +400,14 @@ accordionStories.add(
</Accordion.AccordionHeader>
<Accordion.AccordionBodyItem>
<span>
This is your detailed body. This is your detailed body. This is
your detailed body. This is your detailed body. This is your
detailed body. This is your detailed body.
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec
pretium neque eget semper tempor. Maecenas ultricies est a finibus
tincidunt. Duis rutrum fermentum hendrerit. Aliquam erat volutpat.
Nulla hendrerit ante nunc, ut suscipit nunc auctor eu. Integer
vehicula arcu et urna consectetur auctor. Integer a purus ac leo
molestie facilisis sit amet ac sem. Nam eget sapien ut nisi
molestie iaculis at non augue. Cras dignissim condimentum est, nec
molestie tortor placerat maximus. Integer et vulputate nibh.
</span>
</Accordion.AccordionBodyItem>
</Accordion>
Expand DownExpand Up@@ -448,9 +442,6 @@ accordionFamilyStories.add(
style={{justifyContent: 'none', alignItems: 'start', display: 'block'}}
>
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand All@@ -465,14 +456,14 @@ accordionFamilyStories.add(
</Accordion.AccordionHeader>
<Accordion.AccordionBodyItem>
<span>
This is your detailed body. This is your detailed body. This is
your detailed body. This is your detailed body. This is your
detailed body. This is your detailed body.This is your detailed
body. This is your detailed body. This is your detailed body. This
is your detailed body. This is your detailed body. This is your
detailed body.This is your detailed body. This is your detailed
body. This is your detailed body. This is your detailed body. This
is your detailed body. This is your detailed body.
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec
pretium neque eget semper tempor. Maecenas ultricies est a finibus
tincidunt. Duis rutrum fermentum hendrerit. Aliquam erat volutpat.
Nulla hendrerit ante nunc, ut suscipit nunc auctor eu. Integer
vehicula arcu et urna consectetur auctor. Integer a purus ac leo
molestie facilisis sit amet ac sem. Nam eget sapien ut nisi
molestie iaculis at non augue. Cras dignissim condimentum est, nec
molestie tortor placerat maximus. Integer et vulputate nibh.
</span>
</Accordion.AccordionBodyItem>
</Accordion>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
feat: Clockface 4 ✨ by ChitlangeSahas · Pull Request #860 · influxdata/clockface · GitHub
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
# Changelog

### 6.3.9 (2022-11-02)

- [885](https://github.com/influxdata/clockface/pull/885): (MultiSelect): make MultiSelectDropdown optionally searchable through `isSearchable` prop

### 6.3.8 (2022-10-04)

- [857](https://github.com/influxdata/clockface/pull/857): (TimeInput): Fix the dropdown button width to accomodate for multi-character units
Expand DownExpand Up@@ -39,6 +43,7 @@
### 6.2.0 (2022-08-24)

- [814](https://github.com/influxdata/clockface/pull/814): Added Collapse functionality to the Draggable Resizer

### 6.1.1 (2022-08-17)

- [823](https://github.com/influxdata/clockface/pull/823): Typeahead Dropdown select text on focus works on all browsers
Expand All@@ -55,7 +60,6 @@

- [804](https://github.com/influxdata/clockface/pull/804): Add DoubleCaretVertical icon and trailingIcon prop to Dropdown.Button


### 6.0.0 (2022-08-01)

- [812](https://github.com/influxdata/clockface/pull/812): Remove unused MenuDropdown code
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@influxdata/clockface",
"version": "6.3.8",
"version": "6.3.9",
"license": "MIT",
"main": "dist/index.js",
"style": "dist/index.css",
Expand Down
11 changes: 7 additions & 4 deletions src/Components/Accordion/Accordion.scss
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@

.cf-accordion--icon-container {
position: relative;
// min-width: $cf-space-s;
}

.cf-accordion--icon-container-left {
Expand DownExpand Up@@ -40,7 +39,7 @@
width: 100%;
min-height: $cf-form-lg-height;
border-radius: $cf-radius;
background-color: $cf-grey-25;
background-color: $cf-grey-3;
align-items: center;
outline: none;
padding: $cf-space-s;
Expand DownExpand Up@@ -74,6 +73,10 @@

.cf-accordion--header--content {
width: 100%;

&--no-body {
margin-left: 25px;
}
}

.cf-accordion--body--disabled,
Expand DownExpand Up@@ -115,11 +118,11 @@
@extend .cf-accordion--header;
min-height: $cf-form-md-height;
padding: $cf-form-md-padding;
background-color: $cf-grey-15;
background-color: $cf-grey-2;
border-radius: 0px;

&:hover {
background-color: $cf-grey-15;
background-color: $cf-dark-lavender;
}
}

Expand Down
14 changes: 2 additions & 12 deletions src/Components/Accordion/Accordion.tsx
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
// Libraries
import React, {forwardRef, useState, useEffect} from 'react'
import React, {forwardRef, useEffect, useState} from 'react'
import classnames from 'classnames'
// Styles
import './Accordion.scss'
// Types
import {Direction, StandardFunctionProps} from '../../Types'

export interface AccordionProps extends StandardFunctionProps {
/** Determines whether the expand Icon is at the left, right or doesn't exist. If there is no accordionBody, no icons are shown*/
iconPlacement?: Direction
/** Determines whether the accordion is expanded by default or not */
expanded?: boolean
/** Prevents any interaction with this element, including the onClick function */
Expand DownExpand Up@@ -46,7 +44,6 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
style,
testID = 'accordion',
children,
iconPlacement = Direction.Left,
className,
expanded = false,
disabled = false,
Expand All@@ -61,9 +58,6 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
const [isExpanded, setExpanded] = useState(expanded)
const [animation, setAnimation] = useState(false)
const [isDisabled, setDisabled] = useState(disabled)
const [iconPlacementPosition, setIconPlacementPosition] = useState(
iconPlacement
)

useEffect(() => {
setExpanded(expanded)
Expand All@@ -79,10 +73,6 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
}
}, [isExpanded])

useEffect(() => {
setIconPlacementPosition(iconPlacement)
}, [iconPlacement])

const accordionBodyContainerClassName = classnames(
'cf-accordion--body-container',
{
Expand All@@ -106,7 +96,7 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
const contextState = {
isExpanded,
setExpanded,
iconPlacementPosition: hasBody ? iconPlacementPosition : Direction.None,
iconPlacementPosition: hasBody ? Direction.Left : Direction.None,
isDisabled,
onChange: onChangeFunction,
hasBody: hasBody,
Expand Down
29 changes: 9 additions & 20 deletions src/Components/Accordion/AccordionHeader.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,13 @@ export const AccordionHeader = forwardRef<
[`cf-accordion--header--clickable`]: context.hasBody && !context.isDisabled,
})

const AccordionHeaderContentClassName = classnames(
'cf-accordion--header--content',
{
['cf-accordion--header--content--no-body']: !context.hasBody,
}
)

const toggleExpand = () => {
if (!context.isDisabled) {
context.setExpanded(!context.isExpanded)
Expand All@@ -59,28 +66,10 @@ export const AccordionHeader = forwardRef<
'cf-accordion--icon-container cf-accordion--icon-container-left'
}
>
<Icon
glyph={IconFont.CaretDown_New}
className={AccordionHeaderCaretClassName}
/>
</div>
)}
<div className={'cf-accordion--header--content'}>{children}</div>
{context.iconPlacementPosition === Direction.Right && (
<div
onClick={() => {
context.setExpanded(!context.isExpanded)
}}
className={
'cf-accordion--icon-container cf-accordion--icon-container-right'
}
>
<Icon
glyph={IconFont.CaretDown_New}
className={AccordionHeaderCaretClassName}
/>
<Icon glyph={caretIcon} className={AccordionHeaderCaretClassName} />
</div>
)}
<div className={AccordionHeaderContentClassName}>{children}</div>
</button>
)
})
Expand Down
43 changes: 17 additions & 26 deletions src/Components/Accordion/Documentation/Accordion.stories.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import marked from 'marked'

// Storybook
import {storiesOf} from '@storybook/react'
import {boolean, object, select, withKnobs} from '@storybook/addon-knobs'
import {boolean, object, withKnobs} from '@storybook/addon-knobs'

// Components
import {Accordion, AccordionRef} from '../'
Expand All@@ -18,14 +18,12 @@ import {
AlignItems,
ComponentSize,
FlexDirection,
Direction,
InputToggleType,
JustifyContent,
HeadingElement,
} from '../../../Types'
import {FlexBox} from '../../FlexBox'
import {AccordionBodyItem} from '../AccordionBodyItem'
import {mapEnumKeys} from '../../../Utils/storybook'
import {Heading} from '../../Typography'

const accordionStories = storiesOf(
Expand DownExpand Up@@ -283,9 +281,6 @@ accordionStories.add(
style={{justifyContent: 'none', alignItems: 'start', display: 'block'}}
>
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand DownExpand Up@@ -328,9 +323,6 @@ accordionStories.add(
</Accordion.AccordionBodyItem>
</Accordion>
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand DownExpand Up@@ -399,9 +391,6 @@ accordionStories.add(
>
{' '}
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand All@@ -411,9 +400,14 @@ accordionStories.add(
</Accordion.AccordionHeader>
<Accordion.AccordionBodyItem>
<span>
This is your detailed body. This is your detailed body. This is
your detailed body. This is your detailed body. This is your
detailed body. This is your detailed body.
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec
pretium neque eget semper tempor. Maecenas ultricies est a finibus
tincidunt. Duis rutrum fermentum hendrerit. Aliquam erat volutpat.
Nulla hendrerit ante nunc, ut suscipit nunc auctor eu. Integer
vehicula arcu et urna consectetur auctor. Integer a purus ac leo
molestie facilisis sit amet ac sem. Nam eget sapien ut nisi
molestie iaculis at non augue. Cras dignissim condimentum est, nec
molestie tortor placerat maximus. Integer et vulputate nibh.
</span>
</Accordion.AccordionBodyItem>
</Accordion>
Expand DownExpand Up@@ -448,9 +442,6 @@ accordionFamilyStories.add(
style={{justifyContent: 'none', alignItems: 'start', display: 'block'}}
>
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand All@@ -465,14 +456,14 @@ accordionFamilyStories.add(
</Accordion.AccordionHeader>
<Accordion.AccordionBodyItem>
<span>
This is your detailed body. This is your detailed body. This is
your detailed body. This is your detailed body. This is your
detailed body. This is your detailed body.This is your detailed
body. This is your detailed body. This is your detailed body. This
is your detailed body. This is your detailed body. This is your
detailed body.This is your detailed body. This is your detailed
body. This is your detailed body. This is your detailed body. This
is your detailed body. This is your detailed body.
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec
pretium neque eget semper tempor. Maecenas ultricies est a finibus
tincidunt. Duis rutrum fermentum hendrerit. Aliquam erat volutpat.
Nulla hendrerit ante nunc, ut suscipit nunc auctor eu. Integer
vehicula arcu et urna consectetur auctor. Integer a purus ac leo
molestie facilisis sit amet ac sem. Nam eget sapien ut nisi
molestie iaculis at non augue. Cras dignissim condimentum est, nec
molestie tortor placerat maximus. Integer et vulputate nibh.
</span>
</Accordion.AccordionBodyItem>
</Accordion>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat: Clockface 4 ✨ by ChitlangeSahas · Pull Request #860 · influxdata/clockface · GitHub
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
# Changelog

### 6.3.9 (2022-11-02)

- [885](https://github.com/influxdata/clockface/pull/885): (MultiSelect): make MultiSelectDropdown optionally searchable through `isSearchable` prop

### 6.3.8 (2022-10-04)

- [857](https://github.com/influxdata/clockface/pull/857): (TimeInput): Fix the dropdown button width to accomodate for multi-character units
Expand DownExpand Up@@ -39,6 +43,7 @@
### 6.2.0 (2022-08-24)

- [814](https://github.com/influxdata/clockface/pull/814): Added Collapse functionality to the Draggable Resizer

### 6.1.1 (2022-08-17)

- [823](https://github.com/influxdata/clockface/pull/823): Typeahead Dropdown select text on focus works on all browsers
Expand All@@ -55,7 +60,6 @@

- [804](https://github.com/influxdata/clockface/pull/804): Add DoubleCaretVertical icon and trailingIcon prop to Dropdown.Button


### 6.0.0 (2022-08-01)

- [812](https://github.com/influxdata/clockface/pull/812): Remove unused MenuDropdown code
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@influxdata/clockface",
"version": "6.3.8",
"version": "6.3.9",
"license": "MIT",
"main": "dist/index.js",
"style": "dist/index.css",
Expand Down
11 changes: 7 additions & 4 deletions src/Components/Accordion/Accordion.scss
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@

.cf-accordion--icon-container {
position: relative;
// min-width: $cf-space-s;
}

.cf-accordion--icon-container-left {
Expand DownExpand Up@@ -40,7 +39,7 @@
width: 100%;
min-height: $cf-form-lg-height;
border-radius: $cf-radius;
background-color: $cf-grey-25;
background-color: $cf-grey-3;
align-items: center;
outline: none;
padding: $cf-space-s;
Expand DownExpand Up@@ -74,6 +73,10 @@

.cf-accordion--header--content {
width: 100%;

&--no-body {
margin-left: 25px;
}
}

.cf-accordion--body--disabled,
Expand DownExpand Up@@ -115,11 +118,11 @@
@extend .cf-accordion--header;
min-height: $cf-form-md-height;
padding: $cf-form-md-padding;
background-color: $cf-grey-15;
background-color: $cf-grey-2;
border-radius: 0px;

&:hover {
background-color: $cf-grey-15;
background-color: $cf-dark-lavender;
}
}

Expand Down
14 changes: 2 additions & 12 deletions src/Components/Accordion/Accordion.tsx
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
// Libraries
import React, {forwardRef, useState, useEffect} from 'react'
import React, {forwardRef, useEffect, useState} from 'react'
import classnames from 'classnames'
// Styles
import './Accordion.scss'
// Types
import {Direction, StandardFunctionProps} from '../../Types'

export interface AccordionProps extends StandardFunctionProps {
/** Determines whether the expand Icon is at the left, right or doesn't exist. If there is no accordionBody, no icons are shown*/
iconPlacement?: Direction
/** Determines whether the accordion is expanded by default or not */
expanded?: boolean
/** Prevents any interaction with this element, including the onClick function */
Expand DownExpand Up@@ -46,7 +44,6 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
style,
testID = 'accordion',
children,
iconPlacement = Direction.Left,
className,
expanded = false,
disabled = false,
Expand All@@ -61,9 +58,6 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
const [isExpanded, setExpanded] = useState(expanded)
const [animation, setAnimation] = useState(false)
const [isDisabled, setDisabled] = useState(disabled)
const [iconPlacementPosition, setIconPlacementPosition] = useState(
iconPlacement
)

useEffect(() => {
setExpanded(expanded)
Expand All@@ -79,10 +73,6 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
}
}, [isExpanded])

useEffect(() => {
setIconPlacementPosition(iconPlacement)
}, [iconPlacement])

const accordionBodyContainerClassName = classnames(
'cf-accordion--body-container',
{
Expand All@@ -106,7 +96,7 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
const contextState = {
isExpanded,
setExpanded,
iconPlacementPosition: hasBody ? iconPlacementPosition : Direction.None,
iconPlacementPosition: hasBody ? Direction.Left : Direction.None,
isDisabled,
onChange: onChangeFunction,
hasBody: hasBody,
Expand Down
29 changes: 9 additions & 20 deletions src/Components/Accordion/AccordionHeader.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,13 @@ export const AccordionHeader = forwardRef<
[`cf-accordion--header--clickable`]: context.hasBody && !context.isDisabled,
})

const AccordionHeaderContentClassName = classnames(
'cf-accordion--header--content',
{
['cf-accordion--header--content--no-body']: !context.hasBody,
}
)

const toggleExpand = () => {
if (!context.isDisabled) {
context.setExpanded(!context.isExpanded)
Expand All@@ -59,28 +66,10 @@ export const AccordionHeader = forwardRef<
'cf-accordion--icon-container cf-accordion--icon-container-left'
}
>
<Icon
glyph={IconFont.CaretDown_New}
className={AccordionHeaderCaretClassName}
/>
</div>
)}
<div className={'cf-accordion--header--content'}>{children}</div>
{context.iconPlacementPosition === Direction.Right && (
<div
onClick={() => {
context.setExpanded(!context.isExpanded)
}}
className={
'cf-accordion--icon-container cf-accordion--icon-container-right'
}
>
<Icon
glyph={IconFont.CaretDown_New}
className={AccordionHeaderCaretClassName}
/>
<Icon glyph={caretIcon} className={AccordionHeaderCaretClassName} />
</div>
)}
<div className={AccordionHeaderContentClassName}>{children}</div>
</button>
)
})
Expand Down
43 changes: 17 additions & 26 deletions src/Components/Accordion/Documentation/Accordion.stories.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import marked from 'marked'

// Storybook
import {storiesOf} from '@storybook/react'
import {boolean, object, select, withKnobs} from '@storybook/addon-knobs'
import {boolean, object, withKnobs} from '@storybook/addon-knobs'

// Components
import {Accordion, AccordionRef} from '../'
Expand All@@ -18,14 +18,12 @@ import {
AlignItems,
ComponentSize,
FlexDirection,
Direction,
InputToggleType,
JustifyContent,
HeadingElement,
} from '../../../Types'
import {FlexBox} from '../../FlexBox'
import {AccordionBodyItem} from '../AccordionBodyItem'
import {mapEnumKeys} from '../../../Utils/storybook'
import {Heading} from '../../Typography'

const accordionStories = storiesOf(
Expand DownExpand Up@@ -283,9 +281,6 @@ accordionStories.add(
style={{justifyContent: 'none', alignItems: 'start', display: 'block'}}
>
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand DownExpand Up@@ -328,9 +323,6 @@ accordionStories.add(
</Accordion.AccordionBodyItem>
</Accordion>
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand DownExpand Up@@ -399,9 +391,6 @@ accordionStories.add(
>
{' '}
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand All@@ -411,9 +400,14 @@ accordionStories.add(
</Accordion.AccordionHeader>
<Accordion.AccordionBodyItem>
<span>
This is your detailed body. This is your detailed body. This is
your detailed body. This is your detailed body. This is your
detailed body. This is your detailed body.
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec
pretium neque eget semper tempor. Maecenas ultricies est a finibus
tincidunt. Duis rutrum fermentum hendrerit. Aliquam erat volutpat.
Nulla hendrerit ante nunc, ut suscipit nunc auctor eu. Integer
vehicula arcu et urna consectetur auctor. Integer a purus ac leo
molestie facilisis sit amet ac sem. Nam eget sapien ut nisi
molestie iaculis at non augue. Cras dignissim condimentum est, nec
molestie tortor placerat maximus. Integer et vulputate nibh.
</span>
</Accordion.AccordionBodyItem>
</Accordion>
Expand DownExpand Up@@ -448,9 +442,6 @@ accordionFamilyStories.add(
style={{justifyContent: 'none', alignItems: 'start', display: 'block'}}
>
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand All@@ -465,14 +456,14 @@ accordionFamilyStories.add(
</Accordion.AccordionHeader>
<Accordion.AccordionBodyItem>
<span>
This is your detailed body. This is your detailed body. This is
your detailed body. This is your detailed body. This is your
detailed body. This is your detailed body.This is your detailed
body. This is your detailed body. This is your detailed body. This
is your detailed body. This is your detailed body. This is your
detailed body.This is your detailed body. This is your detailed
body. This is your detailed body. This is your detailed body. This
is your detailed body. This is your detailed body.
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec
pretium neque eget semper tempor. Maecenas ultricies est a finibus
tincidunt. Duis rutrum fermentum hendrerit. Aliquam erat volutpat.
Nulla hendrerit ante nunc, ut suscipit nunc auctor eu. Integer
vehicula arcu et urna consectetur auctor. Integer a purus ac leo
molestie facilisis sit amet ac sem. Nam eget sapien ut nisi
molestie iaculis at non augue. Cras dignissim condimentum est, nec
molestie tortor placerat maximus. Integer et vulputate nibh.
</span>
</Accordion.AccordionBodyItem>
</Accordion>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat: Clockface 4 ✨ by ChitlangeSahas · Pull Request #860 · influxdata/clockface · GitHub
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
# Changelog

### 6.3.9 (2022-11-02)

- [885](https://github.com/influxdata/clockface/pull/885): (MultiSelect): make MultiSelectDropdown optionally searchable through `isSearchable` prop

### 6.3.8 (2022-10-04)

- [857](https://github.com/influxdata/clockface/pull/857): (TimeInput): Fix the dropdown button width to accomodate for multi-character units
Expand DownExpand Up@@ -39,6 +43,7 @@
### 6.2.0 (2022-08-24)

- [814](https://github.com/influxdata/clockface/pull/814): Added Collapse functionality to the Draggable Resizer

### 6.1.1 (2022-08-17)

- [823](https://github.com/influxdata/clockface/pull/823): Typeahead Dropdown select text on focus works on all browsers
Expand All@@ -55,7 +60,6 @@

- [804](https://github.com/influxdata/clockface/pull/804): Add DoubleCaretVertical icon and trailingIcon prop to Dropdown.Button


### 6.0.0 (2022-08-01)

- [812](https://github.com/influxdata/clockface/pull/812): Remove unused MenuDropdown code
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@influxdata/clockface",
"version": "6.3.8",
"version": "6.3.9",
"license": "MIT",
"main": "dist/index.js",
"style": "dist/index.css",
Expand Down
11 changes: 7 additions & 4 deletions src/Components/Accordion/Accordion.scss
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@

.cf-accordion--icon-container {
position: relative;
// min-width: $cf-space-s;
}

.cf-accordion--icon-container-left {
Expand DownExpand Up@@ -40,7 +39,7 @@
width: 100%;
min-height: $cf-form-lg-height;
border-radius: $cf-radius;
background-color: $cf-grey-25;
background-color: $cf-grey-3;
align-items: center;
outline: none;
padding: $cf-space-s;
Expand DownExpand Up@@ -74,6 +73,10 @@

.cf-accordion--header--content {
width: 100%;

&--no-body {
margin-left: 25px;
}
}

.cf-accordion--body--disabled,
Expand DownExpand Up@@ -115,11 +118,11 @@
@extend .cf-accordion--header;
min-height: $cf-form-md-height;
padding: $cf-form-md-padding;
background-color: $cf-grey-15;
background-color: $cf-grey-2;
border-radius: 0px;

&:hover {
background-color: $cf-grey-15;
background-color: $cf-dark-lavender;
}
}

Expand Down
14 changes: 2 additions & 12 deletions src/Components/Accordion/Accordion.tsx
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
// Libraries
import React, {forwardRef, useState, useEffect} from 'react'
import React, {forwardRef, useEffect, useState} from 'react'
import classnames from 'classnames'
// Styles
import './Accordion.scss'
// Types
import {Direction, StandardFunctionProps} from '../../Types'

export interface AccordionProps extends StandardFunctionProps {
/** Determines whether the expand Icon is at the left, right or doesn't exist. If there is no accordionBody, no icons are shown*/
iconPlacement?: Direction
/** Determines whether the accordion is expanded by default or not */
expanded?: boolean
/** Prevents any interaction with this element, including the onClick function */
Expand DownExpand Up@@ -46,7 +44,6 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
style,
testID = 'accordion',
children,
iconPlacement = Direction.Left,
className,
expanded = false,
disabled = false,
Expand All@@ -61,9 +58,6 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
const [isExpanded, setExpanded] = useState(expanded)
const [animation, setAnimation] = useState(false)
const [isDisabled, setDisabled] = useState(disabled)
const [iconPlacementPosition, setIconPlacementPosition] = useState(
iconPlacement
)

useEffect(() => {
setExpanded(expanded)
Expand All@@ -79,10 +73,6 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
}
}, [isExpanded])

useEffect(() => {
setIconPlacementPosition(iconPlacement)
}, [iconPlacement])

const accordionBodyContainerClassName = classnames(
'cf-accordion--body-container',
{
Expand All@@ -106,7 +96,7 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
const contextState = {
isExpanded,
setExpanded,
iconPlacementPosition: hasBody ? iconPlacementPosition : Direction.None,
iconPlacementPosition: hasBody ? Direction.Left : Direction.None,
isDisabled,
onChange: onChangeFunction,
hasBody: hasBody,
Expand Down
29 changes: 9 additions & 20 deletions src/Components/Accordion/AccordionHeader.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,13 @@ export const AccordionHeader = forwardRef<
[`cf-accordion--header--clickable`]: context.hasBody && !context.isDisabled,
})

const AccordionHeaderContentClassName = classnames(
'cf-accordion--header--content',
{
['cf-accordion--header--content--no-body']: !context.hasBody,
}
)

const toggleExpand = () => {
if (!context.isDisabled) {
context.setExpanded(!context.isExpanded)
Expand All@@ -59,28 +66,10 @@ export const AccordionHeader = forwardRef<
'cf-accordion--icon-container cf-accordion--icon-container-left'
}
>
<Icon
glyph={IconFont.CaretDown_New}
className={AccordionHeaderCaretClassName}
/>
</div>
)}
<div className={'cf-accordion--header--content'}>{children}</div>
{context.iconPlacementPosition === Direction.Right && (
<div
onClick={() => {
context.setExpanded(!context.isExpanded)
}}
className={
'cf-accordion--icon-container cf-accordion--icon-container-right'
}
>
<Icon
glyph={IconFont.CaretDown_New}
className={AccordionHeaderCaretClassName}
/>
<Icon glyph={caretIcon} className={AccordionHeaderCaretClassName} />
</div>
)}
<div className={AccordionHeaderContentClassName}>{children}</div>
</button>
)
})
Expand Down
43 changes: 17 additions & 26 deletions src/Components/Accordion/Documentation/Accordion.stories.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import marked from 'marked'

// Storybook
import {storiesOf} from '@storybook/react'
import {boolean, object, select, withKnobs} from '@storybook/addon-knobs'
import {boolean, object, withKnobs} from '@storybook/addon-knobs'

// Components
import {Accordion, AccordionRef} from '../'
Expand All@@ -18,14 +18,12 @@ import {
AlignItems,
ComponentSize,
FlexDirection,
Direction,
InputToggleType,
JustifyContent,
HeadingElement,
} from '../../../Types'
import {FlexBox} from '../../FlexBox'
import {AccordionBodyItem} from '../AccordionBodyItem'
import {mapEnumKeys} from '../../../Utils/storybook'
import {Heading} from '../../Typography'

const accordionStories = storiesOf(
Expand DownExpand Up@@ -283,9 +281,6 @@ accordionStories.add(
style={{justifyContent: 'none', alignItems: 'start', display: 'block'}}
>
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand DownExpand Up@@ -328,9 +323,6 @@ accordionStories.add(
</Accordion.AccordionBodyItem>
</Accordion>
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand DownExpand Up@@ -399,9 +391,6 @@ accordionStories.add(
>
{' '}
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand All@@ -411,9 +400,14 @@ accordionStories.add(
</Accordion.AccordionHeader>
<Accordion.AccordionBodyItem>
<span>
This is your detailed body. This is your detailed body. This is
your detailed body. This is your detailed body. This is your
detailed body. This is your detailed body.
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec
pretium neque eget semper tempor. Maecenas ultricies est a finibus
tincidunt. Duis rutrum fermentum hendrerit. Aliquam erat volutpat.
Nulla hendrerit ante nunc, ut suscipit nunc auctor eu. Integer
vehicula arcu et urna consectetur auctor. Integer a purus ac leo
molestie facilisis sit amet ac sem. Nam eget sapien ut nisi
molestie iaculis at non augue. Cras dignissim condimentum est, nec
molestie tortor placerat maximus. Integer et vulputate nibh.
</span>
</Accordion.AccordionBodyItem>
</Accordion>
Expand DownExpand Up@@ -448,9 +442,6 @@ accordionFamilyStories.add(
style={{justifyContent: 'none', alignItems: 'start', display: 'block'}}
>
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand All@@ -465,14 +456,14 @@ accordionFamilyStories.add(
</Accordion.AccordionHeader>
<Accordion.AccordionBodyItem>
<span>
This is your detailed body. This is your detailed body. This is
your detailed body. This is your detailed body. This is your
detailed body. This is your detailed body.This is your detailed
body. This is your detailed body. This is your detailed body. This
is your detailed body. This is your detailed body. This is your
detailed body.This is your detailed body. This is your detailed
body. This is your detailed body. This is your detailed body. This
is your detailed body. This is your detailed body.
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec
pretium neque eget semper tempor. Maecenas ultricies est a finibus
tincidunt. Duis rutrum fermentum hendrerit. Aliquam erat volutpat.
Nulla hendrerit ante nunc, ut suscipit nunc auctor eu. Integer
vehicula arcu et urna consectetur auctor. Integer a purus ac leo
molestie facilisis sit amet ac sem. Nam eget sapien ut nisi
molestie iaculis at non augue. Cras dignissim condimentum est, nec
molestie tortor placerat maximus. Integer et vulputate nibh.
</span>
</Accordion.AccordionBodyItem>
</Accordion>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' feat: Clockface 4 ✨ by ChitlangeSahas · Pull Request #860 · influxdata/clockface · GitHub
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
# Changelog

### 6.3.9 (2022-11-02)

- [885](https://github.com/influxdata/clockface/pull/885): (MultiSelect): make MultiSelectDropdown optionally searchable through `isSearchable` prop

### 6.3.8 (2022-10-04)

- [857](https://github.com/influxdata/clockface/pull/857): (TimeInput): Fix the dropdown button width to accomodate for multi-character units
Expand DownExpand Up@@ -39,6 +43,7 @@
### 6.2.0 (2022-08-24)

- [814](https://github.com/influxdata/clockface/pull/814): Added Collapse functionality to the Draggable Resizer

### 6.1.1 (2022-08-17)

- [823](https://github.com/influxdata/clockface/pull/823): Typeahead Dropdown select text on focus works on all browsers
Expand All@@ -55,7 +60,6 @@

- [804](https://github.com/influxdata/clockface/pull/804): Add DoubleCaretVertical icon and trailingIcon prop to Dropdown.Button


### 6.0.0 (2022-08-01)

- [812](https://github.com/influxdata/clockface/pull/812): Remove unused MenuDropdown code
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@influxdata/clockface",
"version": "6.3.8",
"version": "6.3.9",
"license": "MIT",
"main": "dist/index.js",
"style": "dist/index.css",
Expand Down
11 changes: 7 additions & 4 deletions src/Components/Accordion/Accordion.scss
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@

.cf-accordion--icon-container {
position: relative;
// min-width: $cf-space-s;
}

.cf-accordion--icon-container-left {
Expand DownExpand Up@@ -40,7 +39,7 @@
width: 100%;
min-height: $cf-form-lg-height;
border-radius: $cf-radius;
background-color: $cf-grey-25;
background-color: $cf-grey-3;
align-items: center;
outline: none;
padding: $cf-space-s;
Expand DownExpand Up@@ -74,6 +73,10 @@

.cf-accordion--header--content {
width: 100%;

&--no-body {
margin-left: 25px;
}
}

.cf-accordion--body--disabled,
Expand DownExpand Up@@ -115,11 +118,11 @@
@extend .cf-accordion--header;
min-height: $cf-form-md-height;
padding: $cf-form-md-padding;
background-color: $cf-grey-15;
background-color: $cf-grey-2;
border-radius: 0px;

&:hover {
background-color: $cf-grey-15;
background-color: $cf-dark-lavender;
}
}

Expand Down
14 changes: 2 additions & 12 deletions src/Components/Accordion/Accordion.tsx
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
// Libraries
import React, {forwardRef, useState, useEffect} from 'react'
import React, {forwardRef, useEffect, useState} from 'react'
import classnames from 'classnames'
// Styles
import './Accordion.scss'
// Types
import {Direction, StandardFunctionProps} from '../../Types'

export interface AccordionProps extends StandardFunctionProps {
/** Determines whether the expand Icon is at the left, right or doesn't exist. If there is no accordionBody, no icons are shown*/
iconPlacement?: Direction
/** Determines whether the accordion is expanded by default or not */
expanded?: boolean
/** Prevents any interaction with this element, including the onClick function */
Expand DownExpand Up@@ -46,7 +44,6 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
style,
testID = 'accordion',
children,
iconPlacement = Direction.Left,
className,
expanded = false,
disabled = false,
Expand All@@ -61,9 +58,6 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
const [isExpanded, setExpanded] = useState(expanded)
const [animation, setAnimation] = useState(false)
const [isDisabled, setDisabled] = useState(disabled)
const [iconPlacementPosition, setIconPlacementPosition] = useState(
iconPlacement
)

useEffect(() => {
setExpanded(expanded)
Expand All@@ -79,10 +73,6 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
}
}, [isExpanded])

useEffect(() => {
setIconPlacementPosition(iconPlacement)
}, [iconPlacement])

const accordionBodyContainerClassName = classnames(
'cf-accordion--body-container',
{
Expand All@@ -106,7 +96,7 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
const contextState = {
isExpanded,
setExpanded,
iconPlacementPosition: hasBody ? iconPlacementPosition : Direction.None,
iconPlacementPosition: hasBody ? Direction.Left : Direction.None,
isDisabled,
onChange: onChangeFunction,
hasBody: hasBody,
Expand Down
29 changes: 9 additions & 20 deletions src/Components/Accordion/AccordionHeader.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,13 @@ export const AccordionHeader = forwardRef<
[`cf-accordion--header--clickable`]: context.hasBody && !context.isDisabled,
})

const AccordionHeaderContentClassName = classnames(
'cf-accordion--header--content',
{
['cf-accordion--header--content--no-body']: !context.hasBody,
}
)

const toggleExpand = () => {
if (!context.isDisabled) {
context.setExpanded(!context.isExpanded)
Expand All@@ -59,28 +66,10 @@ export const AccordionHeader = forwardRef<
'cf-accordion--icon-container cf-accordion--icon-container-left'
}
>
<Icon
glyph={IconFont.CaretDown_New}
className={AccordionHeaderCaretClassName}
/>
</div>
)}
<div className={'cf-accordion--header--content'}>{children}</div>
{context.iconPlacementPosition === Direction.Right && (
<div
onClick={() => {
context.setExpanded(!context.isExpanded)
}}
className={
'cf-accordion--icon-container cf-accordion--icon-container-right'
}
>
<Icon
glyph={IconFont.CaretDown_New}
className={AccordionHeaderCaretClassName}
/>
<Icon glyph={caretIcon} className={AccordionHeaderCaretClassName} />
</div>
)}
<div className={AccordionHeaderContentClassName}>{children}</div>
</button>
)
})
Expand Down
43 changes: 17 additions & 26 deletions src/Components/Accordion/Documentation/Accordion.stories.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import marked from 'marked'

// Storybook
import {storiesOf} from '@storybook/react'
import {boolean, object, select, withKnobs} from '@storybook/addon-knobs'
import {boolean, object, withKnobs} from '@storybook/addon-knobs'

// Components
import {Accordion, AccordionRef} from '../'
Expand All@@ -18,14 +18,12 @@ import {
AlignItems,
ComponentSize,
FlexDirection,
Direction,
InputToggleType,
JustifyContent,
HeadingElement,
} from '../../../Types'
import {FlexBox} from '../../FlexBox'
import {AccordionBodyItem} from '../AccordionBodyItem'
import {mapEnumKeys} from '../../../Utils/storybook'
import {Heading} from '../../Typography'

const accordionStories = storiesOf(
Expand DownExpand Up@@ -283,9 +281,6 @@ accordionStories.add(
style={{justifyContent: 'none', alignItems: 'start', display: 'block'}}
>
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand DownExpand Up@@ -328,9 +323,6 @@ accordionStories.add(
</Accordion.AccordionBodyItem>
</Accordion>
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand DownExpand Up@@ -399,9 +391,6 @@ accordionStories.add(
>
{' '}
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand All@@ -411,9 +400,14 @@ accordionStories.add(
</Accordion.AccordionHeader>
<Accordion.AccordionBodyItem>
<span>
This is your detailed body. This is your detailed body. This is
your detailed body. This is your detailed body. This is your
detailed body. This is your detailed body.
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec
pretium neque eget semper tempor. Maecenas ultricies est a finibus
tincidunt. Duis rutrum fermentum hendrerit. Aliquam erat volutpat.
Nulla hendrerit ante nunc, ut suscipit nunc auctor eu. Integer
vehicula arcu et urna consectetur auctor. Integer a purus ac leo
molestie facilisis sit amet ac sem. Nam eget sapien ut nisi
molestie iaculis at non augue. Cras dignissim condimentum est, nec
molestie tortor placerat maximus. Integer et vulputate nibh.
</span>
</Accordion.AccordionBodyItem>
</Accordion>
Expand DownExpand Up@@ -448,9 +442,6 @@ accordionFamilyStories.add(
style={{justifyContent: 'none', alignItems: 'start', display: 'block'}}
>
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand All@@ -465,14 +456,14 @@ accordionFamilyStories.add(
</Accordion.AccordionHeader>
<Accordion.AccordionBodyItem>
<span>
This is your detailed body. This is your detailed body. This is
your detailed body. This is your detailed body. This is your
detailed body. This is your detailed body.This is your detailed
body. This is your detailed body. This is your detailed body. This
is your detailed body. This is your detailed body. This is your
detailed body.This is your detailed body. This is your detailed
body. This is your detailed body. This is your detailed body. This
is your detailed body. This is your detailed body.
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec
pretium neque eget semper tempor. Maecenas ultricies est a finibus
tincidunt. Duis rutrum fermentum hendrerit. Aliquam erat volutpat.
Nulla hendrerit ante nunc, ut suscipit nunc auctor eu. Integer
vehicula arcu et urna consectetur auctor. Integer a purus ac leo
molestie facilisis sit amet ac sem. Nam eget sapien ut nisi
molestie iaculis at non augue. Cras dignissim condimentum est, nec
molestie tortor placerat maximus. Integer et vulputate nibh.
</span>
</Accordion.AccordionBodyItem>
</Accordion>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat: Clockface 4 ✨ by ChitlangeSahas · Pull Request #860 · influxdata/clockface · GitHub
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
# Changelog

### 6.3.9 (2022-11-02)

- [885](https://github.com/influxdata/clockface/pull/885): (MultiSelect): make MultiSelectDropdown optionally searchable through `isSearchable` prop

### 6.3.8 (2022-10-04)

- [857](https://github.com/influxdata/clockface/pull/857): (TimeInput): Fix the dropdown button width to accomodate for multi-character units
Expand DownExpand Up@@ -39,6 +43,7 @@
### 6.2.0 (2022-08-24)

- [814](https://github.com/influxdata/clockface/pull/814): Added Collapse functionality to the Draggable Resizer

### 6.1.1 (2022-08-17)

- [823](https://github.com/influxdata/clockface/pull/823): Typeahead Dropdown select text on focus works on all browsers
Expand All@@ -55,7 +60,6 @@

- [804](https://github.com/influxdata/clockface/pull/804): Add DoubleCaretVertical icon and trailingIcon prop to Dropdown.Button


### 6.0.0 (2022-08-01)

- [812](https://github.com/influxdata/clockface/pull/812): Remove unused MenuDropdown code
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@influxdata/clockface",
"version": "6.3.8",
"version": "6.3.9",
"license": "MIT",
"main": "dist/index.js",
"style": "dist/index.css",
Expand Down
11 changes: 7 additions & 4 deletions src/Components/Accordion/Accordion.scss
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@

.cf-accordion--icon-container {
position: relative;
// min-width: $cf-space-s;
}

.cf-accordion--icon-container-left {
Expand DownExpand Up@@ -40,7 +39,7 @@
width: 100%;
min-height: $cf-form-lg-height;
border-radius: $cf-radius;
background-color: $cf-grey-25;
background-color: $cf-grey-3;
align-items: center;
outline: none;
padding: $cf-space-s;
Expand DownExpand Up@@ -74,6 +73,10 @@

.cf-accordion--header--content {
width: 100%;

&--no-body {
margin-left: 25px;
}
}

.cf-accordion--body--disabled,
Expand DownExpand Up@@ -115,11 +118,11 @@
@extend .cf-accordion--header;
min-height: $cf-form-md-height;
padding: $cf-form-md-padding;
background-color: $cf-grey-15;
background-color: $cf-grey-2;
border-radius: 0px;

&:hover {
background-color: $cf-grey-15;
background-color: $cf-dark-lavender;
}
}

Expand Down
14 changes: 2 additions & 12 deletions src/Components/Accordion/Accordion.tsx
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
// Libraries
import React, {forwardRef, useState, useEffect} from 'react'
import React, {forwardRef, useEffect, useState} from 'react'
import classnames from 'classnames'
// Styles
import './Accordion.scss'
// Types
import {Direction, StandardFunctionProps} from '../../Types'

export interface AccordionProps extends StandardFunctionProps {
/** Determines whether the expand Icon is at the left, right or doesn't exist. If there is no accordionBody, no icons are shown*/
iconPlacement?: Direction
/** Determines whether the accordion is expanded by default or not */
expanded?: boolean
/** Prevents any interaction with this element, including the onClick function */
Expand DownExpand Up@@ -46,7 +44,6 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
style,
testID = 'accordion',
children,
iconPlacement = Direction.Left,
className,
expanded = false,
disabled = false,
Expand All@@ -61,9 +58,6 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
const [isExpanded, setExpanded] = useState(expanded)
const [animation, setAnimation] = useState(false)
const [isDisabled, setDisabled] = useState(disabled)
const [iconPlacementPosition, setIconPlacementPosition] = useState(
iconPlacement
)

useEffect(() => {
setExpanded(expanded)
Expand All@@ -79,10 +73,6 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
}
}, [isExpanded])

useEffect(() => {
setIconPlacementPosition(iconPlacement)
}, [iconPlacement])

const accordionBodyContainerClassName = classnames(
'cf-accordion--body-container',
{
Expand All@@ -106,7 +96,7 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
const contextState = {
isExpanded,
setExpanded,
iconPlacementPosition: hasBody ? iconPlacementPosition : Direction.None,
iconPlacementPosition: hasBody ? Direction.Left : Direction.None,
isDisabled,
onChange: onChangeFunction,
hasBody: hasBody,
Expand Down
29 changes: 9 additions & 20 deletions src/Components/Accordion/AccordionHeader.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,13 @@ export const AccordionHeader = forwardRef<
[`cf-accordion--header--clickable`]: context.hasBody && !context.isDisabled,
})

const AccordionHeaderContentClassName = classnames(
'cf-accordion--header--content',
{
['cf-accordion--header--content--no-body']: !context.hasBody,
}
)

const toggleExpand = () => {
if (!context.isDisabled) {
context.setExpanded(!context.isExpanded)
Expand All@@ -59,28 +66,10 @@ export const AccordionHeader = forwardRef<
'cf-accordion--icon-container cf-accordion--icon-container-left'
}
>
<Icon
glyph={IconFont.CaretDown_New}
className={AccordionHeaderCaretClassName}
/>
</div>
)}
<div className={'cf-accordion--header--content'}>{children}</div>
{context.iconPlacementPosition === Direction.Right && (
<div
onClick={() => {
context.setExpanded(!context.isExpanded)
}}
className={
'cf-accordion--icon-container cf-accordion--icon-container-right'
}
>
<Icon
glyph={IconFont.CaretDown_New}
className={AccordionHeaderCaretClassName}
/>
<Icon glyph={caretIcon} className={AccordionHeaderCaretClassName} />
</div>
)}
<div className={AccordionHeaderContentClassName}>{children}</div>
</button>
)
})
Expand Down
43 changes: 17 additions & 26 deletions src/Components/Accordion/Documentation/Accordion.stories.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import marked from 'marked'

// Storybook
import {storiesOf} from '@storybook/react'
import {boolean, object, select, withKnobs} from '@storybook/addon-knobs'
import {boolean, object, withKnobs} from '@storybook/addon-knobs'

// Components
import {Accordion, AccordionRef} from '../'
Expand All@@ -18,14 +18,12 @@ import {
AlignItems,
ComponentSize,
FlexDirection,
Direction,
InputToggleType,
JustifyContent,
HeadingElement,
} from '../../../Types'
import {FlexBox} from '../../FlexBox'
import {AccordionBodyItem} from '../AccordionBodyItem'
import {mapEnumKeys} from '../../../Utils/storybook'
import {Heading} from '../../Typography'

const accordionStories = storiesOf(
Expand DownExpand Up@@ -283,9 +281,6 @@ accordionStories.add(
style={{justifyContent: 'none', alignItems: 'start', display: 'block'}}
>
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand DownExpand Up@@ -328,9 +323,6 @@ accordionStories.add(
</Accordion.AccordionBodyItem>
</Accordion>
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand DownExpand Up@@ -399,9 +391,6 @@ accordionStories.add(
>
{' '}
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand All@@ -411,9 +400,14 @@ accordionStories.add(
</Accordion.AccordionHeader>
<Accordion.AccordionBodyItem>
<span>
This is your detailed body. This is your detailed body. This is
your detailed body. This is your detailed body. This is your
detailed body. This is your detailed body.
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec
pretium neque eget semper tempor. Maecenas ultricies est a finibus
tincidunt. Duis rutrum fermentum hendrerit. Aliquam erat volutpat.
Nulla hendrerit ante nunc, ut suscipit nunc auctor eu. Integer
vehicula arcu et urna consectetur auctor. Integer a purus ac leo
molestie facilisis sit amet ac sem. Nam eget sapien ut nisi
molestie iaculis at non augue. Cras dignissim condimentum est, nec
molestie tortor placerat maximus. Integer et vulputate nibh.
</span>
</Accordion.AccordionBodyItem>
</Accordion>
Expand DownExpand Up@@ -448,9 +442,6 @@ accordionFamilyStories.add(
style={{justifyContent: 'none', alignItems: 'start', display: 'block'}}
>
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand All@@ -465,14 +456,14 @@ accordionFamilyStories.add(
</Accordion.AccordionHeader>
<Accordion.AccordionBodyItem>
<span>
This is your detailed body. This is your detailed body. This is
your detailed body. This is your detailed body. This is your
detailed body. This is your detailed body.This is your detailed
body. This is your detailed body. This is your detailed body. This
is your detailed body. This is your detailed body. This is your
detailed body.This is your detailed body. This is your detailed
body. This is your detailed body. This is your detailed body. This
is your detailed body. This is your detailed body.
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec
pretium neque eget semper tempor. Maecenas ultricies est a finibus
tincidunt. Duis rutrum fermentum hendrerit. Aliquam erat volutpat.
Nulla hendrerit ante nunc, ut suscipit nunc auctor eu. Integer
vehicula arcu et urna consectetur auctor. Integer a purus ac leo
molestie facilisis sit amet ac sem. Nam eget sapien ut nisi
molestie iaculis at non augue. Cras dignissim condimentum est, nec
molestie tortor placerat maximus. Integer et vulputate nibh.
</span>
</Accordion.AccordionBodyItem>
</Accordion>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat: Clockface 4 ✨ by ChitlangeSahas · Pull Request #860 · influxdata/clockface · GitHub
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
# Changelog

### 6.3.9 (2022-11-02)

- [885](https://github.com/influxdata/clockface/pull/885): (MultiSelect): make MultiSelectDropdown optionally searchable through `isSearchable` prop

### 6.3.8 (2022-10-04)

- [857](https://github.com/influxdata/clockface/pull/857): (TimeInput): Fix the dropdown button width to accomodate for multi-character units
Expand DownExpand Up@@ -39,6 +43,7 @@
### 6.2.0 (2022-08-24)

- [814](https://github.com/influxdata/clockface/pull/814): Added Collapse functionality to the Draggable Resizer

### 6.1.1 (2022-08-17)

- [823](https://github.com/influxdata/clockface/pull/823): Typeahead Dropdown select text on focus works on all browsers
Expand All@@ -55,7 +60,6 @@

- [804](https://github.com/influxdata/clockface/pull/804): Add DoubleCaretVertical icon and trailingIcon prop to Dropdown.Button


### 6.0.0 (2022-08-01)

- [812](https://github.com/influxdata/clockface/pull/812): Remove unused MenuDropdown code
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@influxdata/clockface",
"version": "6.3.8",
"version": "6.3.9",
"license": "MIT",
"main": "dist/index.js",
"style": "dist/index.css",
Expand Down
11 changes: 7 additions & 4 deletions src/Components/Accordion/Accordion.scss
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@

.cf-accordion--icon-container {
position: relative;
// min-width: $cf-space-s;
}

.cf-accordion--icon-container-left {
Expand DownExpand Up@@ -40,7 +39,7 @@
width: 100%;
min-height: $cf-form-lg-height;
border-radius: $cf-radius;
background-color: $cf-grey-25;
background-color: $cf-grey-3;
align-items: center;
outline: none;
padding: $cf-space-s;
Expand DownExpand Up@@ -74,6 +73,10 @@

.cf-accordion--header--content {
width: 100%;

&--no-body {
margin-left: 25px;
}
}

.cf-accordion--body--disabled,
Expand DownExpand Up@@ -115,11 +118,11 @@
@extend .cf-accordion--header;
min-height: $cf-form-md-height;
padding: $cf-form-md-padding;
background-color: $cf-grey-15;
background-color: $cf-grey-2;
border-radius: 0px;

&:hover {
background-color: $cf-grey-15;
background-color: $cf-dark-lavender;
}
}

Expand Down
14 changes: 2 additions & 12 deletions src/Components/Accordion/Accordion.tsx
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
// Libraries
import React, {forwardRef, useState, useEffect} from 'react'
import React, {forwardRef, useEffect, useState} from 'react'
import classnames from 'classnames'
// Styles
import './Accordion.scss'
// Types
import {Direction, StandardFunctionProps} from '../../Types'

export interface AccordionProps extends StandardFunctionProps {
/** Determines whether the expand Icon is at the left, right or doesn't exist. If there is no accordionBody, no icons are shown*/
iconPlacement?: Direction
/** Determines whether the accordion is expanded by default or not */
expanded?: boolean
/** Prevents any interaction with this element, including the onClick function */
Expand DownExpand Up@@ -46,7 +44,6 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
style,
testID = 'accordion',
children,
iconPlacement = Direction.Left,
className,
expanded = false,
disabled = false,
Expand All@@ -61,9 +58,6 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
const [isExpanded, setExpanded] = useState(expanded)
const [animation, setAnimation] = useState(false)
const [isDisabled, setDisabled] = useState(disabled)
const [iconPlacementPosition, setIconPlacementPosition] = useState(
iconPlacement
)

useEffect(() => {
setExpanded(expanded)
Expand All@@ -79,10 +73,6 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
}
}, [isExpanded])

useEffect(() => {
setIconPlacementPosition(iconPlacement)
}, [iconPlacement])

const accordionBodyContainerClassName = classnames(
'cf-accordion--body-container',
{
Expand All@@ -106,7 +96,7 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
const contextState = {
isExpanded,
setExpanded,
iconPlacementPosition: hasBody ? iconPlacementPosition : Direction.None,
iconPlacementPosition: hasBody ? Direction.Left : Direction.None,
isDisabled,
onChange: onChangeFunction,
hasBody: hasBody,
Expand Down
29 changes: 9 additions & 20 deletions src/Components/Accordion/AccordionHeader.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,13 @@ export const AccordionHeader = forwardRef<
[`cf-accordion--header--clickable`]: context.hasBody && !context.isDisabled,
})

const AccordionHeaderContentClassName = classnames(
'cf-accordion--header--content',
{
['cf-accordion--header--content--no-body']: !context.hasBody,
}
)

const toggleExpand = () => {
if (!context.isDisabled) {
context.setExpanded(!context.isExpanded)
Expand All@@ -59,28 +66,10 @@ export const AccordionHeader = forwardRef<
'cf-accordion--icon-container cf-accordion--icon-container-left'
}
>
<Icon
glyph={IconFont.CaretDown_New}
className={AccordionHeaderCaretClassName}
/>
</div>
)}
<div className={'cf-accordion--header--content'}>{children}</div>
{context.iconPlacementPosition === Direction.Right && (
<div
onClick={() => {
context.setExpanded(!context.isExpanded)
}}
className={
'cf-accordion--icon-container cf-accordion--icon-container-right'
}
>
<Icon
glyph={IconFont.CaretDown_New}
className={AccordionHeaderCaretClassName}
/>
<Icon glyph={caretIcon} className={AccordionHeaderCaretClassName} />
</div>
)}
<div className={AccordionHeaderContentClassName}>{children}</div>
</button>
)
})
Expand Down
43 changes: 17 additions & 26 deletions src/Components/Accordion/Documentation/Accordion.stories.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import marked from 'marked'

// Storybook
import {storiesOf} from '@storybook/react'
import {boolean, object, select, withKnobs} from '@storybook/addon-knobs'
import {boolean, object, withKnobs} from '@storybook/addon-knobs'

// Components
import {Accordion, AccordionRef} from '../'
Expand All@@ -18,14 +18,12 @@ import {
AlignItems,
ComponentSize,
FlexDirection,
Direction,
InputToggleType,
JustifyContent,
HeadingElement,
} from '../../../Types'
import {FlexBox} from '../../FlexBox'
import {AccordionBodyItem} from '../AccordionBodyItem'
import {mapEnumKeys} from '../../../Utils/storybook'
import {Heading} from '../../Typography'

const accordionStories = storiesOf(
Expand DownExpand Up@@ -283,9 +281,6 @@ accordionStories.add(
style={{justifyContent: 'none', alignItems: 'start', display: 'block'}}
>
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand DownExpand Up@@ -328,9 +323,6 @@ accordionStories.add(
</Accordion.AccordionBodyItem>
</Accordion>
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand DownExpand Up@@ -399,9 +391,6 @@ accordionStories.add(
>
{' '}
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand All@@ -411,9 +400,14 @@ accordionStories.add(
</Accordion.AccordionHeader>
<Accordion.AccordionBodyItem>
<span>
This is your detailed body. This is your detailed body. This is
your detailed body. This is your detailed body. This is your
detailed body. This is your detailed body.
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec
pretium neque eget semper tempor. Maecenas ultricies est a finibus
tincidunt. Duis rutrum fermentum hendrerit. Aliquam erat volutpat.
Nulla hendrerit ante nunc, ut suscipit nunc auctor eu. Integer
vehicula arcu et urna consectetur auctor. Integer a purus ac leo
molestie facilisis sit amet ac sem. Nam eget sapien ut nisi
molestie iaculis at non augue. Cras dignissim condimentum est, nec
molestie tortor placerat maximus. Integer et vulputate nibh.
</span>
</Accordion.AccordionBodyItem>
</Accordion>
Expand DownExpand Up@@ -448,9 +442,6 @@ accordionFamilyStories.add(
style={{justifyContent: 'none', alignItems: 'start', display: 'block'}}
>
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand All@@ -465,14 +456,14 @@ accordionFamilyStories.add(
</Accordion.AccordionHeader>
<Accordion.AccordionBodyItem>
<span>
This is your detailed body. This is your detailed body. This is
your detailed body. This is your detailed body. This is your
detailed body. This is your detailed body.This is your detailed
body. This is your detailed body. This is your detailed body. This
is your detailed body. This is your detailed body. This is your
detailed body.This is your detailed body. This is your detailed
body. This is your detailed body. This is your detailed body. This
is your detailed body. This is your detailed body.
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec
pretium neque eget semper tempor. Maecenas ultricies est a finibus
tincidunt. Duis rutrum fermentum hendrerit. Aliquam erat volutpat.
Nulla hendrerit ante nunc, ut suscipit nunc auctor eu. Integer
vehicula arcu et urna consectetur auctor. Integer a purus ac leo
molestie facilisis sit amet ac sem. Nam eget sapien ut nisi
molestie iaculis at non augue. Cras dignissim condimentum est, nec
molestie tortor placerat maximus. Integer et vulputate nibh.
</span>
</Accordion.AccordionBodyItem>
</Accordion>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); feat: Clockface 4 ✨ by ChitlangeSahas · Pull Request #860 · influxdata/clockface · GitHub
Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
# Changelog

### 6.3.9 (2022-11-02)

- [885](https://github.com/influxdata/clockface/pull/885): (MultiSelect): make MultiSelectDropdown optionally searchable through `isSearchable` prop

### 6.3.8 (2022-10-04)

- [857](https://github.com/influxdata/clockface/pull/857): (TimeInput): Fix the dropdown button width to accomodate for multi-character units
Expand DownExpand Up@@ -39,6 +43,7 @@
### 6.2.0 (2022-08-24)

- [814](https://github.com/influxdata/clockface/pull/814): Added Collapse functionality to the Draggable Resizer

### 6.1.1 (2022-08-17)

- [823](https://github.com/influxdata/clockface/pull/823): Typeahead Dropdown select text on focus works on all browsers
Expand All@@ -55,7 +60,6 @@

- [804](https://github.com/influxdata/clockface/pull/804): Add DoubleCaretVertical icon and trailingIcon prop to Dropdown.Button


### 6.0.0 (2022-08-01)

- [812](https://github.com/influxdata/clockface/pull/812): Remove unused MenuDropdown code
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "@influxdata/clockface",
"version": "6.3.8",
"version": "6.3.9",
"license": "MIT",
"main": "dist/index.js",
"style": "dist/index.css",
Expand Down
11 changes: 7 additions & 4 deletions src/Components/Accordion/Accordion.scss
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@

.cf-accordion--icon-container {
position: relative;
// min-width: $cf-space-s;
}

.cf-accordion--icon-container-left {
Expand DownExpand Up@@ -40,7 +39,7 @@
width: 100%;
min-height: $cf-form-lg-height;
border-radius: $cf-radius;
background-color: $cf-grey-25;
background-color: $cf-grey-3;
align-items: center;
outline: none;
padding: $cf-space-s;
Expand DownExpand Up@@ -74,6 +73,10 @@

.cf-accordion--header--content {
width: 100%;

&--no-body {
margin-left: 25px;
}
}

.cf-accordion--body--disabled,
Expand DownExpand Up@@ -115,11 +118,11 @@
@extend .cf-accordion--header;
min-height: $cf-form-md-height;
padding: $cf-form-md-padding;
background-color: $cf-grey-15;
background-color: $cf-grey-2;
border-radius: 0px;

&:hover {
background-color: $cf-grey-15;
background-color: $cf-dark-lavender;
}
}

Expand Down
14 changes: 2 additions & 12 deletions src/Components/Accordion/Accordion.tsx
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
// Libraries
import React, {forwardRef, useState, useEffect} from 'react'
import React, {forwardRef, useEffect, useState} from 'react'
import classnames from 'classnames'
// Styles
import './Accordion.scss'
// Types
import {Direction, StandardFunctionProps} from '../../Types'

export interface AccordionProps extends StandardFunctionProps {
/** Determines whether the expand Icon is at the left, right or doesn't exist. If there is no accordionBody, no icons are shown*/
iconPlacement?: Direction
/** Determines whether the accordion is expanded by default or not */
expanded?: boolean
/** Prevents any interaction with this element, including the onClick function */
Expand DownExpand Up@@ -46,7 +44,6 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
style,
testID = 'accordion',
children,
iconPlacement = Direction.Left,
className,
expanded = false,
disabled = false,
Expand All@@ -61,9 +58,6 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
const [isExpanded, setExpanded] = useState(expanded)
const [animation, setAnimation] = useState(false)
const [isDisabled, setDisabled] = useState(disabled)
const [iconPlacementPosition, setIconPlacementPosition] = useState(
iconPlacement
)

useEffect(() => {
setExpanded(expanded)
Expand All@@ -79,10 +73,6 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
}
}, [isExpanded])

useEffect(() => {
setIconPlacementPosition(iconPlacement)
}, [iconPlacement])

const accordionBodyContainerClassName = classnames(
'cf-accordion--body-container',
{
Expand All@@ -106,7 +96,7 @@ export const AccordionRoot = forwardRef<AccordionRef, AccordionProps>(
const contextState = {
isExpanded,
setExpanded,
iconPlacementPosition: hasBody ? iconPlacementPosition : Direction.None,
iconPlacementPosition: hasBody ? Direction.Left : Direction.None,
isDisabled,
onChange: onChangeFunction,
hasBody: hasBody,
Expand Down
29 changes: 9 additions & 20 deletions src/Components/Accordion/AccordionHeader.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,13 @@ export const AccordionHeader = forwardRef<
[`cf-accordion--header--clickable`]: context.hasBody && !context.isDisabled,
})

const AccordionHeaderContentClassName = classnames(
'cf-accordion--header--content',
{
['cf-accordion--header--content--no-body']: !context.hasBody,
}
)

const toggleExpand = () => {
if (!context.isDisabled) {
context.setExpanded(!context.isExpanded)
Expand All@@ -59,28 +66,10 @@ export const AccordionHeader = forwardRef<
'cf-accordion--icon-container cf-accordion--icon-container-left'
}
>
<Icon
glyph={IconFont.CaretDown_New}
className={AccordionHeaderCaretClassName}
/>
</div>
)}
<div className={'cf-accordion--header--content'}>{children}</div>
{context.iconPlacementPosition === Direction.Right && (
<div
onClick={() => {
context.setExpanded(!context.isExpanded)
}}
className={
'cf-accordion--icon-container cf-accordion--icon-container-right'
}
>
<Icon
glyph={IconFont.CaretDown_New}
className={AccordionHeaderCaretClassName}
/>
<Icon glyph={caretIcon} className={AccordionHeaderCaretClassName} />
</div>
)}
<div className={AccordionHeaderContentClassName}>{children}</div>
</button>
)
})
Expand Down
43 changes: 17 additions & 26 deletions src/Components/Accordion/Documentation/Accordion.stories.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,7 +4,7 @@ import marked from 'marked'

// Storybook
import {storiesOf} from '@storybook/react'
import {boolean, object, select, withKnobs} from '@storybook/addon-knobs'
import {boolean, object, withKnobs} from '@storybook/addon-knobs'

// Components
import {Accordion, AccordionRef} from '../'
Expand All@@ -18,14 +18,12 @@ import {
AlignItems,
ComponentSize,
FlexDirection,
Direction,
InputToggleType,
JustifyContent,
HeadingElement,
} from '../../../Types'
import {FlexBox} from '../../FlexBox'
import {AccordionBodyItem} from '../AccordionBodyItem'
import {mapEnumKeys} from '../../../Utils/storybook'
import {Heading} from '../../Typography'

const accordionStories = storiesOf(
Expand DownExpand Up@@ -283,9 +281,6 @@ accordionStories.add(
style={{justifyContent: 'none', alignItems: 'start', display: 'block'}}
>
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand DownExpand Up@@ -328,9 +323,6 @@ accordionStories.add(
</Accordion.AccordionBodyItem>
</Accordion>
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand DownExpand Up@@ -399,9 +391,6 @@ accordionStories.add(
>
{' '}
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand All@@ -411,9 +400,14 @@ accordionStories.add(
</Accordion.AccordionHeader>
<Accordion.AccordionBodyItem>
<span>
This is your detailed body. This is your detailed body. This is
your detailed body. This is your detailed body. This is your
detailed body. This is your detailed body.
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec
pretium neque eget semper tempor. Maecenas ultricies est a finibus
tincidunt. Duis rutrum fermentum hendrerit. Aliquam erat volutpat.
Nulla hendrerit ante nunc, ut suscipit nunc auctor eu. Integer
vehicula arcu et urna consectetur auctor. Integer a purus ac leo
molestie facilisis sit amet ac sem. Nam eget sapien ut nisi
molestie iaculis at non augue. Cras dignissim condimentum est, nec
molestie tortor placerat maximus. Integer et vulputate nibh.
</span>
</Accordion.AccordionBodyItem>
</Accordion>
Expand DownExpand Up@@ -448,9 +442,6 @@ accordionFamilyStories.add(
style={{justifyContent: 'none', alignItems: 'start', display: 'block'}}
>
<Accordion
iconPlacement={
Direction[select('Icon Placement', mapEnumKeys(Direction), 'Left')]
}
expanded={boolean('expanded', false)}
disabled={disabled}
style={object('style', {})}
Expand All@@ -465,14 +456,14 @@ accordionFamilyStories.add(
</Accordion.AccordionHeader>
<Accordion.AccordionBodyItem>
<span>
This is your detailed body. This is your detailed body. This is
your detailed body. This is your detailed body. This is your
detailed body. This is your detailed body.This is your detailed
body. This is your detailed body. This is your detailed body. This
is your detailed body. This is your detailed body. This is your
detailed body.This is your detailed body. This is your detailed
body. This is your detailed body. This is your detailed body. This
is your detailed body. This is your detailed body.
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec
pretium neque eget semper tempor. Maecenas ultricies est a finibus
tincidunt. Duis rutrum fermentum hendrerit. Aliquam erat volutpat.
Nulla hendrerit ante nunc, ut suscipit nunc auctor eu. Integer
vehicula arcu et urna consectetur auctor. Integer a purus ac leo
molestie facilisis sit amet ac sem. Nam eget sapien ut nisi
molestie iaculis at non augue. Cras dignissim condimentum est, nec
molestie tortor placerat maximus. Integer et vulputate nibh.
</span>
</Accordion.AccordionBodyItem>
</Accordion>
Expand Down
Loading