Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.
[feat] UI updates for effects (#2428)
Igor Dykhta1ae4cd0279be
diff --git a/examples/demo-app/src/factories/map-control.js b/examples/demo-app/src/factories/map-control.jsindex 96f39e9a2..a22eaea61 100644--- a/examples/demo-app/src/factories/map-control.js+++ b/examples/demo-app/src/factories/map-control.js@@ -58,10 +58,14 @@ const StyledMapControlOverlay = styled.div`pointer-events: all;}- margin-top: ${props => props.theme.rightPanelMarginTop}px;- margin-right: ${props => props.theme.rightPanelMarginRight}px;+ margin-top: ${props => (props.rightPanelVisible ? props.theme.rightPanelMarginTop : 0)}px;+ margin-right: ${props => (props.rightPanelVisible ? props.theme.rightPanelMarginRight : 0)}px;${props => (props.fullHeight ? 'height' : 'max-height')}: calc(100% - ${props =>props.theme.rightPanelMarginTop + props.theme.bottomWidgetPaddingBottom}px);++ .map-control {+ ${props => (props.rightPanelVisible ? 'padding-top: 0px;' : '')}+ }`;CustomMapControlFactory.deps = [@@ -74,9 +78,9 @@ function CustomMapControlFactory(EffectControl, EffectManager, ...deps) {const actionComponents = [...(MapControl.defaultProps?.actionComponents ?? []), EffectControl];const CustomMapControl = props => {- const showEffects = props.mapControls?.effect?.active;+ const showEffects = Boolean(props.mapControls?.effect?.active);return (- <StyledMapControlOverlay top={props.top}>+ <StyledMapControlOverlay top={props.top} rightPanelVisible={showEffects}><StyledMapControlPanel>{!props.isExport && props.currentSample ? <SampleMapPanel {...props} /> : null}<MapControl {...props} top={0} actionComponents={actionComponents} />diff --git a/src/components/src/common/icons/arrow-down-small.tsx b/src/components/src/common/icons/arrow-down-small.tsxnew file mode 100644index 000000000..84e685319--- /dev/null+++ b/src/components/src/common/icons/arrow-down-small.tsx@@ -0,0 +1,30 @@+import React, {Component} from 'react';+import PropTypes from 'prop-types';+import Base from './base';++export default class ArrowDownSmall extends Component {+ static propTypes = {+ /** Set the height of the icon, ex. '16px' */+ height: PropTypes.string+ };++ static defaultProps = {+ height: '16px',+ viewBox: '0 0 16 16',+ predefinedClassName: 'data-ex-icons-arrow-down-small'+ };++ render() {+ return (+ <Base {...this.props}>+ <svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">+ <path+ fillRule="evenodd"+ clipRule="evenodd"+ d="M12.4419 5.55807C12.1979 5.314 11.8021 5.314 11.5581 5.55807L8 9.11613L4.44194 5.55807C4.19786 5.314 3.80214 5.314 3.55806 5.55807C3.31398 5.80215 3.31398 6.19788 3.55806 6.44196L7.55806 10.442C7.67527 10.5592 7.83424 10.625 8 10.625C8.16576 10.625 8.32473 10.5592 8.44194 10.442L12.4419 6.44196C12.686 6.19788 12.686 5.80215 12.4419 5.55807Z"+ />+ </svg>+ </Base>+ );+ }+}diff --git a/src/components/src/common/icons/calendar.tsx b/src/components/src/common/icons/calendar.tsxnew file mode 100644index 000000000..be8117dbf--- /dev/null+++ b/src/components/src/common/icons/calendar.tsx@@ -0,0 +1,24 @@+import React, {Component} from 'react';+import Base, {BaseProps} from './base';++export default class Calendar extends Component<Partial<BaseProps>> {+ static defaultProps = {+ height: '16px',+ viewBox: '0 0 16 16',+ predefinedClassName: 'data-ex-icons-calendar'+ };++ render() {+ return (+ <Base {...this.props}>+ <svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">+ <path+ fillRule="evenodd"+ clipRule="evenodd"+ d="M11.2537 3H13.5C14.0523 3 14.5 3.44772 14.5 4V13C14.5 13.5523 14.0523 14 13.5 14H2.5C1.94772 14 1.5 13.5523 1.5 13V4C1.5 3.44772 1.94772 3 2.5 3H4.73697V2.5C4.73697 2.22386 4.96082 2 5.23697 2C5.51311 2 5.73697 2.22386 5.73697 2.5V3H10.2537V2.5C10.2537 2.22386 10.4776 2 10.7537 2C11.0299 2 11.2537 2.22386 11.2537 2.5V3ZM2.5 13H13.5V7H2.5V13ZM13.5 6H2.5V4H4.7V4.45C4.7 4.75376 4.94624 5 5.25 5C5.55376 5 5.8 4.75376 5.8 4.45V4H10.2V4.45C10.2 4.75376 10.4462 5 10.75 5C11.0538 5 11.3 4.75376 11.3 4.45V4H13.5V6Z"+ />+ </svg>+ </Base>+ );+ }+}diff --git a/src/components/src/common/icons/effects/brightness-contrast.tsx b/src/components/src/common/icons/effects/brightness-contrast.tsxnew file mode 100644index 000000000..03f5b8cf5--- /dev/null+++ b/src/components/src/common/icons/effects/brightness-contrast.tsx@@ -0,0 +1,38 @@+import React, {Component} from 'react';+import PropTypes from 'prop-types';+import Base from '../base';++export default class BrightnessContrast extends Component {+ static propTypes = {+ /** Set the height of the icon, ex. '16px' */+ height: PropTypes.string+ };++ static defaultProps = {+ height: '16px',+ viewBox: '0 0 16 16',+ predefinedClassName: 'data-ex-icons-brightness-contrast'+ };++ render() {+ return (+ <Base {...this.props}>+ <svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">+ <path d="M8.381 2.28577H7.6191V3.42862H8.381V2.28577Z" />+ <path d="M13.7143 7.6191H12.5715V8.381H13.7143V7.6191Z" />+ <path d="M7.6191 12.5715H8.381V13.7143H7.6191V12.5715Z" />+ <path d="M3.42862 7.6191H2.28577V8.381H3.42862V7.6191Z" />+ <path d="M3.63645 4.22943L4.22137 3.6445L5.09876 4.52189L4.51383 5.10682L3.63645 4.22943Z" />+ <path d="M11.7725 3.64043L10.8951 4.51782L11.48 5.10274L12.3574 4.22535L11.7725 3.64043Z" />+ <path d="M10.8963 11.4812L11.4812 10.8963L12.3586 11.7737L11.7736 12.3586L10.8963 11.4812Z" />+ <path d="M3.42862 11.9645L4.34377 11.0477L4.95243 11.6589L4.03728 12.5715L3.42862 11.9645Z" />+ <path+ fillRule="evenodd"+ clipRule="evenodd"+ d="M6.09524 5.1493C6.65907 4.77256 7.32195 4.57148 8.00005 4.57148C8.90937 4.57148 9.78144 4.9327 10.4244 5.57569C11.0674 6.21867 11.4286 7.09074 11.4286 8.00005C11.4286 8.67816 11.2275 9.34104 10.8508 9.90486C10.4741 10.4687 9.9386 10.9081 9.31211 11.1676C8.68562 11.4271 7.99625 11.495 7.33117 11.3627C6.66609 11.2305 6.05518 10.9039 5.57569 10.4244C5.09619 9.94492 4.76965 9.33401 4.63736 8.66893C4.50507 8.00385 4.57297 7.31448 4.83247 6.68799C5.09197 6.06151 5.53142 5.52604 6.09524 5.1493ZM6.18178 9.81833C6.66402 10.3006 7.31807 10.5715 8.00005 10.5715V5.42862C7.31807 5.42862 6.66402 5.69954 6.18178 6.18178C5.69954 6.66401 5.42862 7.31807 5.42862 8.00005C5.42862 8.68204 5.69954 9.33609 6.18178 9.81833Z"+ />+ </svg>+ </Base>+ );+ }+}diff --git a/src/components/src/common/icons/effects/color-halftone.tsx b/src/components/src/common/icons/effects/color-halftone.tsxnew file mode 100644index 000000000..2aec45292--- /dev/null+++ b/src/components/src/common/icons/effects/color-halftone.tsx@@ -0,0 +1,82 @@+import React, {Component} from 'react';+import PropTypes from 'prop-types';+import Base from '../base';++export default class ColorHalftone extends Component {+ static propTypes = {+ /** Set the height of the icon, ex. '16px' */+ height: PropTypes.string+ };++ static defaultProps = {+ height: '16px',+ viewBox: '0 0 16 16',+ predefinedClassName: 'data-ex-icons-color-halftone'+ };++ render() {+ return (+ <Base {...this.props}>+ <svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">+ <g clipPath="url(#clip0_129_11269)">+ <path d="M4.03812 5.10475C4.03812 5.69386 3.56056 6.17142 2.97145 6.17142C2.38235 6.17142 1.90479 5.69386 1.90479 5.10475C1.90479 4.51565 2.38235 4.03809 2.97145 4.03809C3.56056 4.03809 4.03812 4.51565 4.03812 5.10475Z" />+ <path+ opacity="0.5"+ d="M2.81902 11.0476C2.81902 11.3843 2.54613 11.6572 2.2095 11.6572C1.87287 11.6572 1.59998 11.3843 1.59998 11.0476C1.59998 10.711 1.87287 10.4381 2.2095 10.4381C2.54613 10.4381 2.81902 10.711 2.81902 11.0476Z"+ />+ <path d="M5.86668 1.90484C5.86668 2.5781 5.3209 3.12389 4.64764 3.12389C3.97438 3.12389 3.42859 2.5781 3.42859 1.90484C3.42859 1.23158 3.97438 0.685791 4.64764 0.685791C5.3209 0.685791 5.86668 1.23158 5.86668 1.90484Z" />+ <path d="M2.51427 1.90484C2.51427 2.5781 1.96848 3.12389 1.29522 3.12389C0.621958 3.12389 0.0761719 2.5781 0.0761719 1.90484C0.0761719 1.23158 0.621958 0.685791 1.29522 0.685791C1.96848 0.685791 2.51427 1.23158 2.51427 1.90484Z" />+ <path d="M4.95235 8.30479C4.95235 8.80973 4.54301 9.21907 4.03807 9.21907C3.53312 9.21907 3.12378 8.80973 3.12378 8.30479C3.12378 7.79984 3.53312 7.3905 4.03807 7.3905C4.54301 7.3905 4.95235 7.79984 4.95235 8.30479Z" />+ <path+ opacity="0.3"+ d="M4.34287 13.3334C4.34287 13.5858 4.1382 13.7905 3.88573 13.7905C3.63326 13.7905 3.42859 13.5858 3.42859 13.3334C3.42859 13.0809 3.63326 12.8762 3.88573 12.8762C4.1382 12.8762 4.34287 13.0809 4.34287 13.3334Z"+ />+ <path d="M7.39054 5.10475C7.39054 5.69386 6.91297 6.17142 6.32387 6.17142C5.73477 6.17142 5.2572 5.69386 5.2572 5.10475C5.2572 4.51565 5.73477 4.03809 6.32387 4.03809C6.91297 4.03809 7.39054 4.51565 7.39054 5.10475Z" />+ <path+ opacity="0.5"+ d="M6.17144 11.0476C6.17144 11.3843 5.89855 11.6572 5.56192 11.6572C5.22529 11.6572 4.95239 11.3843 4.95239 11.0476C4.95239 10.711 5.22529 10.4381 5.56192 10.4381C5.89855 10.4381 6.17144 10.711 6.17144 11.0476Z"+ />+ <path d="M9.2191 1.90484C9.2191 2.5781 8.67332 3.12389 8.00005 3.12389C7.32679 3.12389 6.78101 2.5781 6.78101 1.90484C6.78101 1.23158 7.32679 0.685791 8.00005 0.685791C8.67332 0.685791 9.2191 1.23158 9.2191 1.90484Z" />+ <path d="M8.30477 8.30479C8.30477 8.80973 7.89543 9.21907 7.39048 9.21907C6.88554 9.21907 6.4762 8.80973 6.4762 8.30479C6.4762 7.79984 6.88554 7.3905 7.39048 7.3905C7.89543 7.3905 8.30477 7.79984 8.30477 8.30479Z" />+ <path+ opacity="0.3"+ d="M7.69529 13.3334C7.69529 13.5858 7.49062 13.7905 7.23815 13.7905C6.98568 13.7905 6.78101 13.5858 6.78101 13.3334C6.78101 13.0809 6.98568 12.8762 7.23815 12.8762C7.49062 12.8762 7.69529 13.0809 7.69529 13.3334Z"+ />+ <path d="M10.7428 5.10475C10.7428 5.69386 10.2653 6.17142 9.67616 6.17142C9.08706 6.17142 8.6095 5.69386 8.6095 5.10475C8.6095 4.51565 9.08706 4.03809 9.67616 4.03809C10.2653 4.03809 10.7428 4.51565 10.7428 5.10475Z" />+ <path+ opacity="0.5"+ d="M9.52386 11.0476C9.52386 11.3843 9.25096 11.6572 8.91433 11.6572C8.5777 11.6572 8.30481 11.3843 8.30481 11.0476C8.30481 10.711 8.5777 10.4381 8.91433 10.4381C9.25096 10.4381 9.52386 10.711 9.52386 11.0476Z"+ />+ <path d="M12.5714 1.90484C12.5714 2.5781 12.0256 3.12389 11.3523 3.12389C10.6791 3.12389 10.1333 2.5781 10.1333 1.90484C10.1333 1.23158 10.6791 0.685791 11.3523 0.685791C12.0256 0.685791 12.5714 1.23158 12.5714 1.90484Z" />+ <path d="M11.6572 8.30479C11.6572 8.80973 11.2478 9.21907 10.7429 9.21907C10.238 9.21907 9.82861 8.80973 9.82861 8.30479C9.82861 7.79984 10.238 7.3905 10.7429 7.3905C11.2478 7.3905 11.6572 7.79984 11.6572 8.30479Z" />+ <path+ opacity="0.3"+ d="M11.0476 13.3334C11.0476 13.5858 10.8429 13.7905 10.5904 13.7905C10.338 13.7905 10.1333 13.5858 10.1333 13.3334C10.1333 13.0809 10.338 12.8762 10.5904 12.8762C10.8429 12.8762 11.0476 13.0809 11.0476 13.3334Z"+ />+ <path d="M14.0952 5.10475C14.0952 5.69386 13.6177 6.17142 13.0286 6.17142C12.4395 6.17142 11.9619 5.69386 11.9619 5.10475C11.9619 4.51565 12.4395 4.03809 13.0286 4.03809C13.6177 4.03809 14.0952 4.51565 14.0952 5.10475Z" />+ <path+ opacity="0.5"+ d="M12.8763 11.0476C12.8763 11.3843 12.6034 11.6572 12.2668 11.6572C11.9301 11.6572 11.6572 11.3843 11.6572 11.0476C11.6572 10.711 11.9301 10.4381 12.2668 10.4381C12.6034 10.4381 12.8763 10.711 12.8763 11.0476Z"+ />+ <path d="M15.9238 1.90484C15.9238 2.5781 15.378 3.12389 14.7048 3.12389C14.0315 3.12389 13.4857 2.5781 13.4857 1.90484C13.4857 1.23158 14.0315 0.685791 14.7048 0.685791C15.378 0.685791 15.9238 1.23158 15.9238 1.90484Z" />+ <path d="M15.0096 8.30479C15.0096 8.80973 14.6003 9.21907 14.0953 9.21907C13.5904 9.21907 13.181 8.80973 13.181 8.30479C13.181 7.79984 13.5904 7.3905 14.0953 7.3905C14.6003 7.3905 15.0096 7.79984 15.0096 8.30479Z" />+ <path+ opacity="0.3"+ d="M14.4 13.3334C14.4 13.5858 14.1953 13.7905 13.9429 13.7905C13.6904 13.7905 13.4857 13.5858 13.4857 13.3334C13.4857 13.0809 13.6904 12.8762 13.9429 12.8762C14.1953 12.8762 14.4 13.0809 14.4 13.3334Z"+ />+ </g>+ <defs>+ <clipPath id="clip0_129_11269">+ <rect+ width="12.1905"+ height="12.1905"+ fill="white"+ transform="translate(1.90479 1.90479)"+ />+ </clipPath>+ </defs>+ </svg>+ </Base>+ );+ }+}diff --git a/src/components/src/common/icons/effects/dot-screen.tsx b/src/components/src/common/icons/effects/dot-screen.tsxnew file mode 100644index 000000000..9b22475c0--- /dev/null+++ b/src/components/src/common/icons/effects/dot-screen.tsx@@ -0,0 +1,55 @@+import React, {Component} from 'react';+import PropTypes from 'prop-types';+import Base from '../base';++export default class DotScreen extends Component {+ static propTypes = {+ /** Set the height of the icon, ex. '16px' */+ height: PropTypes.string+ };++ static defaultProps = {+ height: '16px',+ viewBox: '0 0 16 16',+ predefinedClassName: 'data-ex-icons-dot-screen'+ };++ render() {+ return (+ <Base {...this.props}>+ <svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">+ <g clipPath="url(#clip0_129_11268)">+ <path d="M4.34288 4.95245C4.34288 5.62571 3.79709 6.17149 3.12383 6.17149C2.45057 6.17149 1.90479 5.62571 1.90479 4.95245C1.90479 4.27918 2.45057 3.7334 3.12383 3.7334C3.79709 3.7334 4.34288 4.27918 4.34288 4.95245Z" />+ <path d="M4.34288 11.0477C4.34288 11.7209 3.79709 12.2667 3.12383 12.2667C2.45057 12.2667 1.90479 11.7209 1.90479 11.0477C1.90479 10.3744 2.45057 9.82861 3.12383 9.82861C3.79709 9.82861 4.34288 10.3744 4.34288 11.0477Z" />+ <path d="M5.86668 1.90484C5.86668 2.5781 5.3209 3.12389 4.64764 3.12389C3.97438 3.12389 3.42859 2.5781 3.42859 1.90484C3.42859 1.23158 3.97438 0.685791 4.64764 0.685791C5.3209 0.685791 5.86668 1.23158 5.86668 1.90484Z" />+ <path d="M2.51427 1.90484C2.51427 2.5781 1.96848 3.12389 1.29522 3.12389C0.621958 3.12389 0.0761719 2.5781 0.0761719 1.90484C0.0761719 1.23158 0.621958 0.685791 1.29522 0.685791C1.96848 0.685791 2.51427 1.23158 2.51427 1.90484Z" />+ <path d="M5.86668 8.00005C5.86668 8.67332 5.3209 9.2191 4.64764 9.2191C3.97438 9.2191 3.42859 8.67332 3.42859 8.00005C3.42859 7.32679 3.97438 6.78101 4.64764 6.78101C5.3209 6.78101 5.86668 7.32679 5.86668 8.00005Z" />+ <path d="M2.51427 8.00005C2.51427 8.67332 1.96848 9.2191 1.29522 9.2191C0.621958 9.2191 0.0761719 8.67332 0.0761719 8.00005C0.0761719 7.32679 0.621958 6.78101 1.29522 6.78101C1.96848 6.78101 2.51427 7.32679 2.51427 8.00005Z" />+ <path d="M5.86668 14.0953C5.86668 14.7685 5.3209 15.3143 4.64764 15.3143C3.97438 15.3143 3.42859 14.7685 3.42859 14.0953C3.42859 13.422 3.97438 12.8762 4.64764 12.8762C5.3209 12.8762 5.86668 13.422 5.86668 14.0953Z" />+ <path d="M2.51427 14.0953C2.51427 14.7685 1.96848 15.3143 1.29522 15.3143C0.621958 15.3143 0.0761719 14.7685 0.0761719 14.0953C0.0761719 13.422 0.621958 12.8762 1.29522 12.8762C1.96848 12.8762 2.51427 13.422 2.51427 14.0953Z" />+ <path d="M7.6953 4.95245C7.6953 5.62571 7.14951 6.17149 6.47625 6.17149C5.80299 6.17149 5.2572 5.62571 5.2572 4.95245C5.2572 4.27918 5.80299 3.7334 6.47625 3.7334C7.14951 3.7334 7.6953 4.27918 7.6953 4.95245Z" />+ <path d="M7.6953 11.0477C7.6953 11.7209 7.14951 12.2667 6.47625 12.2667C5.80299 12.2667 5.2572 11.7209 5.2572 11.0477C5.2572 10.3744 5.80299 9.82861 6.47625 9.82861C7.14951 9.82861 7.6953 10.3744 7.6953 11.0477Z" />+ <path d="M9.2191 1.90484C9.2191 2.5781 8.67332 3.12389 8.00005 3.12389C7.32679 3.12389 6.78101 2.5781 6.78101 1.90484C6.78101 1.23158 7.32679 0.685791 8.00005 0.685791C8.67332 0.685791 9.2191 1.23158 9.2191 1.90484Z" />+ <path d="M9.2191 8.00005C9.2191 8.67332 8.67332 9.2191 8.00005 9.2191C7.32679 9.2191 6.78101 8.67332 6.78101 8.00005C6.78101 7.32679 7.32679 6.78101 8.00005 6.78101C8.67332 6.78101 9.2191 7.32679 9.2191 8.00005Z" />+ <path d="M9.2191 14.0953C9.2191 14.7685 8.67332 15.3143 8.00005 15.3143C7.32679 15.3143 6.78101 14.7685 6.78101 14.0953C6.78101 13.422 7.32679 12.8762 8.00005 12.8762C8.67332 12.8762 9.2191 13.422 9.2191 14.0953Z" />+ <path d="M11.0476 4.95245C11.0476 5.62571 10.5018 6.17149 9.82854 6.17149C9.15528 6.17149 8.6095 5.62571 8.6095 4.95245C8.6095 4.27918 9.15528 3.7334 9.82854 3.7334C10.5018 3.7334 11.0476 4.27918 11.0476 4.95245Z" />+ <path d="M11.0476 11.0477C11.0476 11.7209 10.5018 12.2667 9.82854 12.2667C9.15528 12.2667 8.6095 11.7209 8.6095 11.0477C8.6095 10.3744 9.15528 9.82861 9.82854 9.82861C10.5018 9.82861 11.0476 10.3744 11.0476 11.0477Z" />+ <path d="M12.5714 1.90484C12.5714 2.5781 12.0256 3.12389 11.3523 3.12389C10.6791 3.12389 10.1333 2.5781 10.1333 1.90484C10.1333 1.23158 10.6791 0.685791 11.3523 0.685791C12.0256 0.685791 12.5714 1.23158 12.5714 1.90484Z" />+ <path d="M12.5714 8.00005C12.5714 8.67332 12.0256 9.2191 11.3523 9.2191C10.6791 9.2191 10.1333 8.67332 10.1333 8.00005C10.1333 7.32679 10.6791 6.78101 11.3523 6.78101C12.0256 6.78101 12.5714 7.32679 12.5714 8.00005Z" />+ <path d="M12.5714 14.0953C12.5714 14.7685 12.0256 15.3143 11.3523 15.3143C10.6791 15.3143 10.1333 14.7685 10.1333 14.0953C10.1333 13.422 10.6791 12.8762 11.3523 12.8762C12.0256 12.8762 12.5714 13.422 12.5714 14.0953Z" />+ <path d="M14.4 4.95245C14.4 5.62571 13.8542 6.17149 13.181 6.17149C12.5077 6.17149 11.9619 5.62571 11.9619 4.95245C11.9619 4.27918 12.5077 3.7334 13.181 3.7334C13.8542 3.7334 14.4 4.27918 14.4 4.95245Z" />+ <path d="M14.4 11.0477C14.4 11.7209 13.8542 12.2667 13.181 12.2667C12.5077 12.2667 11.9619 11.7209 11.9619 11.0477C11.9619 10.3744 12.5077 9.82861 13.181 9.82861C13.8542 9.82861 14.4 10.3744 14.4 11.0477Z" />+ <path d="M15.9238 1.90484C15.9238 2.5781 15.378 3.12389 14.7048 3.12389C14.0315 3.12389 13.4857 2.5781 13.4857 1.90484C13.4857 1.23158 14.0315 0.685791 14.7048 0.685791C15.378 0.685791 15.9238 1.23158 15.9238 1.90484Z" />+ <path d="M15.9238 8.00005C15.9238 8.67332 15.378 9.2191 14.7048 9.2191C14.0315 9.2191 13.4857 8.67332 13.4857 8.00005C13.4857 7.32679 14.0315 6.78101 14.7048 6.78101C15.378 6.78101 15.9238 7.32679 15.9238 8.00005Z" />+ <path d="M15.9238 14.0953C15.9238 14.7685 15.378 15.3143 14.7048 15.3143C14.0315 15.3143 13.4857 14.7685 13.4857 14.0953C13.4857 13.422 14.0315 12.8762 14.7048 12.8762C15.378 12.8762 15.9238 13.422 15.9238 14.0953Z" />+ </g>+ <defs>+ <clipPath id="clip0_129_11268">+ <rect width="12.1905" height="12.1905" transform="translate(1.90479 1.90479)" />+ </clipPath>+ </defs>+ </svg>+ </Base>+ );+ }+}diff --git a/src/components/src/common/icons/effects/edge-work.tsx b/src/components/src/common/icons/effects/edge-work.tsxnew file mode 100644index 000000000..99ecf49c1--- /dev/null+++ b/src/components/src/common/icons/effects/edge-work.tsx@@ -0,0 +1,35 @@+import React, {Component} from 'react';+import PropTypes from 'prop-types';+import Base from '../base';++export default class EdgeWork extends Component {+ static propTypes = {+ /** Set the height of the icon, ex. '16px' */+ height: PropTypes.string+ };++ static defaultProps = {+ height: '16px',+ viewBox: '0 0 16 16',+ predefinedClassName: 'data-ex-icons-edge-work'+ };++ render() {+ return (+ <Base {...this.props}>+ <svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">+ <g clipPath="url(#clip0_129_11274)">+ <path d="M4.06642 1.90479L1.90479 6.33314L2.53682 6.64166L4.11683 3.40484L5.98457 6.65718L8.0826 3.33597L10.0205 6.71046L11.7371 3.38925L13.4983 6.45609L14.1082 6.10584L11.7045 1.92037L9.98798 5.24157L8.11129 1.97365L6.01326 5.29486L4.06642 1.90479Z" />+ <path d="M4.06593 5.36231L6.01361 9.09299L8.11163 5.43967L9.98765 9.03309L11.7042 5.37976L14.1026 9.97369L13.4791 10.2992L11.7374 6.96301L10.0208 10.6163L8.08225 6.9031L5.98423 10.5564L4.11732 6.98045L2.55385 10.5037L1.91099 10.2184L4.06593 5.36231Z" />+ <path d="M4.06642 9.28959L6.01326 12.6797L8.11129 9.35845L9.98798 12.6264L11.7045 9.30517L14.1082 13.4906L13.4983 13.8409L11.7371 10.7741L10.0205 14.0953L8.0826 10.7208L5.98457 14.042L4.11683 10.7896L2.53682 14.0265L1.90479 13.7179L4.06642 9.28959Z" />+ </g>+ <defs>+ <clipPath id="clip0_129_11274">+ <rect width="16" height="16" />+ </clipPath>+ </defs>+ </svg>+ </Base>+ );+ }+}diff --git a/src/components/src/common/icons/effects/hexagonal-pixelate.tsx b/src/components/src/common/icons/effects/hexagonal-pixelate.tsxnew file mode 100644index 000000000..07f934565--- /dev/null+++ b/src/components/src/common/icons/effects/hexagonal-pixelate.tsx@@ -0,0 +1,113 @@+import React, {Component} from 'react';+import PropTypes from 'prop-types';+import Base from '../base';++export default class HexagonalPixelate extends Component {+ static propTypes = {+ /** Set the height of the icon, ex. '16px' */+ height: PropTypes.string+ };++ static defaultProps = {+ height: '16px',+ viewBox: '0 0 16 16',+ predefinedClassName: 'data-ex-icons-hexagonal-pixelate'+ };++ render() {+ return (+ <Base {...this.props}>+ <svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">+ <g clipPath="url(#clip0_129_11277)">+ <path+ opacity="0.5"+ d="M4.91606 1.29938L3.36296 0.376709L1.81042 1.29835L1.811 3.14267L3.36411 4.06534L4.91664 3.14369L4.91606 1.29938Z"+ />+ <path+ opacity="0.5"+ d="M4.91606 6.73529L3.36296 5.81262L1.81042 6.73427L1.811 8.57858L3.36411 9.50125L4.91664 8.5796L4.91606 6.73529Z"+ />+ <path+ opacity="0.5"+ d="M4.91606 12.1711L3.36296 11.2484L1.81042 12.1701L1.811 14.0144L3.36411 14.937L4.91664 14.0154L4.91606 12.1711Z"+ />+ <path+ opacity="0.7"+ d="M3.36296 4.01727L1.80986 3.0946L0.257324 4.01625L0.257899 5.86056L1.811 6.78323L3.36354 5.86159L3.36296 4.01727Z"+ />+ <path+ opacity="0.7"+ d="M3.36296 9.45319L1.80986 8.53052L0.257324 9.45216L0.257899 11.2965L1.811 12.2191L3.36354 11.2975L3.36296 9.45319Z"+ />+ <path+ opacity="0.5"+ d="M3.36296 14.8891L1.80986 13.9664L0.257324 14.8881L0.257899 16.7324L1.811 17.6551L3.36354 16.7334L3.36296 14.8891Z"+ />+ <path+ opacity="0.7"+ d="M8.02226 1.29938L6.46916 0.376709L4.91663 1.29835L4.9172 3.14267L6.47031 4.06534L8.02284 3.14369L8.02226 1.29938Z"+ />+ <path+ opacity="0.7"+ d="M8.02226 6.73529L6.46916 5.81262L4.91663 6.73427L4.9172 8.57858L6.47031 9.50125L8.02284 8.5796L8.02226 6.73529Z"+ />+ <path+ opacity="0.7"+ d="M8.02226 12.1711L6.46916 11.2484L4.91663 12.1701L4.9172 14.0144L6.47031 14.937L8.02284 14.0154L8.02226 12.1711Z"+ />+ <path d="M6.46916 4.01727L4.91606 3.0946L3.36353 4.01625L3.3641 5.86056L4.91721 6.78323L6.46974 5.86159L6.46916 4.01727Z" />+ <path d="M6.46916 9.45319L4.91606 8.53052L3.36353 9.45216L3.3641 11.2965L4.91721 12.2191L6.46974 11.2975L6.46916 9.45319Z" />+ <path d="M6.46916 14.8891L4.91606 13.9664L3.36353 14.8881L3.3641 16.7324L4.91721 17.6551L6.46974 16.7334L6.46916 14.8891Z" />+ <path d="M11.1285 1.29938L9.57536 0.376709L8.02283 1.29835L8.0234 3.14267L9.57651 4.06534L11.129 3.14369L11.1285 1.29938Z" />+ <path d="M11.1285 6.73529L9.57536 5.81262L8.02283 6.73427L8.0234 8.57858L9.57651 9.50125L11.129 8.5796L11.1285 6.73529Z" />+ <path d="M11.1285 12.1711L9.57536 11.2484L8.02283 12.1701L8.0234 14.0144L9.57651 14.937L11.129 14.0154L11.1285 12.1711Z" />+ <path+ opacity="0.5"+ d="M9.57536 4.01727L8.02226 3.0946L6.46973 4.01625L6.4703 5.86056L8.02341 6.78323L9.57594 5.86159L9.57536 4.01727Z"+ />+ <path+ opacity="0.5"+ d="M9.57536 9.45319L8.02226 8.53052L6.46973 9.45216L6.4703 11.2965L8.02341 12.2191L9.57594 11.2975L9.57536 9.45319Z"+ />+ <path+ opacity="0.3"+ d="M9.57536 14.8891L8.02226 13.9664L6.46973 14.8881L6.4703 16.7324L8.02341 17.6551L9.57594 16.7334L9.57536 14.8891Z"+ />+ <path+ opacity="0.5"+ d="M14.2347 1.29938L12.6816 0.376709L11.129 1.29835L11.1296 3.14267L12.6827 4.06534L14.2352 3.14369L14.2347 1.29938Z"+ />+ <path+ opacity="0.5"+ d="M14.2347 6.73529L12.6816 5.81262L11.129 6.73427L11.1296 8.57858L12.6827 9.50125L14.2352 8.5796L14.2347 6.73529Z"+ />+ <path+ opacity="0.5"+ d="M14.2347 12.1711L12.6816 11.2484L11.129 12.1701L11.1296 14.0144L12.6827 14.937L14.2352 14.0154L14.2347 12.1711Z"+ />+ <path+ opacity="0.7"+ d="M12.6816 4.01727L11.1285 3.0946L9.57593 4.01625L9.5765 5.86056L11.1296 6.78323L12.6821 5.86159L12.6816 4.01727Z"+ />+ <path d="M15.7878 4.01727L14.2347 3.0946L12.6821 4.01625L12.6827 5.86056L14.2358 6.78323L15.7883 5.86159L15.7878 4.01727Z" />+ <path+ opacity="0.7"+ d="M12.6816 9.45319L11.1285 8.53052L9.57593 9.45216L9.5765 11.2965L11.1296 12.2191L12.6821 11.2975L12.6816 9.45319Z"+ />+ <path+ opacity="0.5"+ d="M12.6816 14.8891L11.1285 13.9664L9.57593 14.8881L9.5765 16.7324L11.1296 17.6551L12.6821 16.7334L12.6816 14.8891Z"+ />+ <path d="M15.7878 9.45319L14.2347 8.53052L12.6821 9.45216L12.6827 11.2965L14.2358 12.2191L15.7883 11.2975L15.7878 9.45319Z" />+ <path d="M15.7878 14.8891L14.2347 13.9664L12.6821 14.8881L12.6827 16.7324L14.2358 17.6551L15.7883 16.7334L15.7878 14.8891Z" />+ </g>+ <defs>+ <clipPath id="clip0_129_11277">+ <rect width="12.1905" height="12.1905" transform="translate(1.90479 1.90479)" />+ </clipPath>+ </defs>+ </svg>+ </Base>+ );+ }+}diff --git a/src/components/src/common/icons/effects/hue-saturation.tsx b/src/components/src/common/icons/effects/hue-saturation.tsxnew file mode 100644index 000000000..7e37bbd79--- /dev/null+++ b/src/components/src/common/icons/effects/hue-saturation.tsx@@ -0,0 +1,37 @@+import React, {Component} from 'react';+import PropTypes from 'prop-types';+import Base from '../base';++export default class HueSaturation extends Component {+ static propTypes = {+ /** Set the height of the icon, ex. '16px' */+ height: PropTypes.string+ };++ static defaultProps = {+ height: '16px',+ viewBox: '0 0 16 16',+ predefinedClassName: 'data-ex-icons-hue-saturation'+ };++ render() {+ return (+ <Base {...this.props}>+ <svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">+ <g clipPath="url(#clip0_129_11265)">+ <path+ fillRule="evenodd"+ clipRule="evenodd"+ d="M3.87106 6.06729C3.87098 6.05614 3.87093 6.04499 3.87093 6.03382C3.87093 3.75342 5.71956 1.90479 7.99996 1.90479C10.2804 1.90479 12.129 3.75342 12.129 6.03382C12.129 6.04496 12.129 6.05609 12.1289 6.06721C13.3087 6.79404 14.0953 8.0978 14.0953 9.58527C14.0953 11.8657 12.2467 13.7143 9.96625 13.7143C9.25441 13.7143 8.58464 13.5342 8.00003 13.217C7.41543 13.5342 6.74566 13.7143 6.03382 13.7143C3.75342 13.7143 1.90479 11.8657 1.90479 9.58527C1.90479 8.09786 2.69127 6.79414 3.87106 6.06729ZM9.36787 9.11148C8.94989 9.29754 8.487 9.40094 7.99996 9.40094C7.51297 9.40094 7.05013 9.29756 6.63219 9.11154C6.76297 8.18272 7.27272 7.37559 8.00003 6.85155C8.72733 7.37558 9.23707 8.18269 9.36787 9.11148ZM9.384 9.92517C8.95134 10.0791 8.48543 10.1628 7.99996 10.1628C7.51455 10.1628 7.04869 10.0791 6.61607 9.92522C6.71482 10.9102 7.23801 11.77 8.00003 12.319C8.76207 11.7699 9.28527 10.9101 9.384 9.92517ZM5.93393 8.69278C6.12934 7.8059 6.60989 7.026 7.27454 6.45411C6.89059 6.30184 6.47198 6.21815 6.03382 6.21815C5.54678 6.21815 5.08389 6.32155 4.66591 6.50761C4.79064 7.39331 5.25996 8.16835 5.93393 8.69278ZM3.96766 6.9264C4.21174 8.03404 4.90058 8.97481 5.83735 9.55189C5.83726 9.563 5.83722 9.57413 5.83722 9.58527C5.83722 10.8373 6.3945 11.9592 7.27454 12.7164C6.89059 12.8687 6.47198 12.9524 6.03382 12.9524C4.1742 12.9524 2.66669 11.4449 2.66669 9.58527C2.66669 8.50441 3.17597 7.5425 3.96766 6.9264ZM4.64978 5.69392C4.82019 3.99393 6.25508 2.66669 7.99996 2.66669C9.74483 2.66669 11.1797 3.9939 11.3501 5.69387C10.9175 5.54 10.4517 5.45624 9.96625 5.45624C9.25441 5.45624 8.58464 5.63638 8.00003 5.95355C7.41543 5.63638 6.74566 5.45624 6.03382 5.45624C5.54835 5.45624 5.08244 5.54002 4.64978 5.69392ZM11.334 6.50755C10.9161 6.32153 10.4532 6.21815 9.96625 6.21815C9.52809 6.21815 9.10948 6.30184 8.72553 6.45411C9.39016 7.02598 9.87069 7.80585 10.0661 8.69269C10.74 8.16825 11.2093 7.39322 11.334 6.50755ZM12.0323 6.92631C11.7882 8.03394 11.0994 8.9747 10.1627 9.5518C10.1628 9.56295 10.1629 9.5741 10.1629 9.58527C10.1629 10.8373 9.60557 11.9592 8.72553 12.7164C9.10948 12.8687 9.52809 12.9524 9.96625 12.9524C11.8259 12.9524 13.3334 11.4449 13.3334 9.58527C13.3334 8.50435 12.824 7.5424 12.0323 6.92631Z"+ />+ </g>+ <defs>+ <clipPath id="clip0_129_11265">+ <rect width="16" height="16" />+ </clipPath>+ </defs>+ </svg>+ </Base>+ );+ }+}diff --git a/src/components/src/common/icons/effects/ink.tsx b/src/components/src/common/icons/effects/ink.tsxnew file mode 100644index 000000000..8d48b2feb--- /dev/null+++ b/src/components/src/common/icons/effects/ink.tsx@@ -0,0 +1,33 @@+import React, {Component} from 'react';+import PropTypes from 'prop-types';+import Base from '../base';++export default class Ink extends Component {+ static propTypes = {+ /** Set the height of the icon, ex. '16px' */+ height: PropTypes.string+ };++ static defaultProps = {+ height: '16px',+ viewBox: '0 0 16 16',+ predefinedClassName: 'data-ex-icons-ink'+ };++ render() {+ return (+ <Base {...this.props}>+ <svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">+ <g clipPath="url(#clip0_129_11263)">+ <path d="M11.3656 10.5766C10.8658 11.4055 10.2342 11.142 9.64103 10.7907C9.04785 10.4394 8.48763 10.0168 8.13062 10.5163C7.74066 10.9444 8.04275 11.6305 8.19653 12.2343C8.35032 12.8435 8.3613 13.3704 7.38915 13.4857C6.62021 13.3814 6.66415 12.7447 6.79048 12.0696C6.9168 11.3945 7.11453 10.6809 6.62021 10.4284C6.22476 10.165 5.95014 10.6206 5.60412 11.0706C5.24712 11.5152 4.84068 11.9488 4.17061 11.6305C3.56644 11.131 3.79712 10.8401 4.11568 10.4669C4.43424 10.0936 4.84617 9.59415 4.61 8.71594C4.51113 8.35917 4.01682 8.4415 3.528 8.43052C3.05016 8.41954 2.56683 8.32074 2.5174 7.6072C2.47895 7.17358 2.803 6.99794 3.13804 6.86072C3.47856 6.7235 3.82459 6.6247 3.83008 6.27891C3.84655 5.94409 3.62137 5.70807 3.47856 5.46108C3.33576 5.21408 3.27535 4.95611 3.61587 4.57189C4.19258 4.09985 4.65394 4.50054 5.1153 4.93415C5.57666 5.36777 6.03253 5.82334 6.59825 5.46657C7.04862 5.17017 6.63669 4.64873 6.31813 4.13828C5.99957 3.62782 5.77439 3.13931 6.59825 2.91427C7.31226 2.71668 7.58688 3.20518 7.83403 3.77053C8.08668 4.33587 8.30638 4.97806 8.91054 5.09333C9.77285 5.2525 10.399 4.24256 10.9977 3.4412C11.5963 2.63983 12.184 2.04155 12.9365 3.02954C13.7603 4.06692 12.9749 4.54994 12.0577 4.97806C11.1405 5.37875 10.0859 5.73003 10.3386 6.50395C10.4869 6.95403 10.9702 6.70704 11.481 6.53688C11.9863 6.36673 12.53 6.27342 12.7937 7.04734C13.0738 7.86517 12.4092 8.05179 11.6622 8.12864C10.9153 8.20548 10.0804 8.17255 10.0255 8.54579C9.96508 8.93549 10.4649 9.09467 10.8988 9.3252C11.3327 9.56121 11.7007 9.87408 11.3656 10.5766ZM12.6618 11.8391C12.1401 11.8391 11.8709 11.4329 11.8709 11.0157C11.8709 10.5986 12.1346 10.1924 12.6618 10.1924C13.2111 10.1924 13.4857 10.5986 13.4857 11.0157C13.4857 11.4329 13.2111 11.8391 12.6618 11.8391Z" />+ </g>+ <defs>+ <clipPath id="clip0_129_11263">+ <rect width="16" height="16" fill="white" />+ </clipPath>+ </defs>+ </svg>+ </Base>+ );+ }+}diff --git a/src/components/src/common/icons/effects/light-and-shadow.tsx b/src/components/src/common/icons/effects/light-and-shadow.tsxnew file mode 100644index 000000000..251e96f48--- /dev/null+++ b/src/components/src/common/icons/effects/light-and-shadow.tsx@@ -0,0 +1,28 @@+import React, {Component} from 'react';+import PropTypes from 'prop-types';+import Base from '../base';++export default class LightAndShadow extends Component {+ static propTypes = {+ /** Set the height of the icon, ex. '16px' */+ height: PropTypes.string+ };++ static defaultProps = {+ height: '16px',+ viewBox: '0 0 16 16',+ predefinedClassName: 'data-ex-icons-light-and-shadow'+ };++ render() {+ return (+ <Base {...this.props}>+ <path+ fillRule="evenodd"+ clipRule="evenodd"+ d="M1.91925 7.57675C2.13661 4.40791 4.776 1.90479 8.00002 1.90479C11.3663 1.90479 14.0953 4.63372 14.0953 8.00002C14.0953 11.3663 11.3663 14.0953 8.00002 14.0953C4.74735 14.0953 2.08974 11.5475 1.91403 8.33866H1.90479V7.57675H1.91925ZM8.00002 12.4021V13.4701C6.784 13.4701 5.66065 13.0733 4.75239 12.4021H8.00002ZM8.00002 11.6402V10.3704H3.0688C3.29618 10.8426 3.58938 11.2771 3.9365 11.662V11.6402H8.00002ZM8.00002 9.60849V8.33866H2.54025C2.56708 8.77796 2.64576 9.20325 2.77025 9.60849H8.00002ZM8.00002 7.57675V6.3069H2.79701C2.66543 6.71153 2.57974 7.13686 2.54607 7.57675H8.00002ZM8.00002 2.52994V3.51325H4.87018C5.75697 2.8935 6.83604 2.52994 8.00002 2.52994ZM3.9941 4.27516H8.00002V5.54499H3.11048C3.34449 5.07982 3.64294 4.65264 3.9941 4.27516Z"+ />+ </Base>+ );+ }+}diff --git a/src/components/src/common/icons/effects/magic-wand.tsx b/src/components/src/common/icons/effects/magic-wand.tsxnew file mode 100644index 000000000..880f30540--- /dev/null+++ b/src/components/src/common/icons/effects/magic-wand.tsx@@ -0,0 +1,34 @@+import React, {Component} from 'react';+import PropTypes from 'prop-types';+import Base from '../base';++export default class MagicWand extends Component {+ static propTypes = {+ /** Set the height of the icon, ex. '16px' */+ height: PropTypes.string+ };++ static defaultProps = {+ height: '16px',+ viewBox: '2 2 20 20',+ predefinedClassName: 'data-ex-icons-effects-magic-wand'+ };++ render() {+ return (+ <Base {...this.props}>+ <g clipPath="url(#clip0_129_11251)">+ <path d="M18.7071 16L10 7.29298C9.80957 7.11112 9.55636 7.00964 9.29301 7.00964C9.02967 7.00964 8.77645 7.11112 8.58599 7.29298L7.29299 8.58598C7.10576 8.77365 7.00061 9.02792 7.00061 9.29301C7.00061 9.5581 7.10576 9.81237 7.29299 10L15.9995 18.7071C16.1872 18.8943 16.4415 18.9994 16.7066 18.9994C16.9716 18.9994 17.2259 18.8943 17.4136 18.7071L18.7071 17.4138C18.8 17.321 18.8736 17.2108 18.9239 17.0895C18.9742 16.9682 19 16.8381 19 16.7068C19 16.5755 18.9742 16.4455 18.9239 16.3242C18.8736 16.2028 18.8 16.0929 18.7071 16ZM8.00004 9.29298L9.29299 8.00003L11.793 10.5L10.4997 11.7935L7.99969 9.29348L8.00004 9.29298ZM16.7066 18L11.2066 12.5005L12.5 11.2071L18 16.7071L16.7066 18Z" />+ <path d="M5.99999 11L5 12L5.99999 13L6.99998 12L5.99999 11Z" />+ <path d="M12 5.00001L11 6L12 6.99999L13 6L12 5.00001Z" />+ <path d="M5.99999 5.00001L5 6L5.99999 6.99999L6.99998 6L5.99999 5.00001Z" />+ </g>+ <defs>+ <clipPath id="clip0_129_11251">+ <rect width="16" height="16" transform="translate(4 4)" />+ </clipPath>+ </defs>{' '}+ </Base>+ );+ }+}diff --git a/src/components/src/common/icons/effects/magnify.tsx b/src/components/src/common/icons/effects/magnify.tsxnew file mode 100644index 000000000..f30e2c0aa--- /dev/null+++ b/src/components/src/common/icons/effects/magnify.tsx@@ -0,0 +1,37 @@+import React, {Component} from 'react';+import PropTypes from 'prop-types';+import Base from '../base';++export default class Magnify extends Component {+ static propTypes = {+ /** Set the height of the icon, ex. '16px' */+ height: PropTypes.string+ };++ static defaultProps = {+ height: '16px',+ viewBox: '0 0 16 16',+ predefinedClassName: 'data-ex-icons-magnify'+ };++ render() {+ return (+ <Base {...this.props}>+ <svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">+ <path d="M1.90479 10.5143H2.66669V12.1905C2.66669 12.8217 3.17836 13.3334 3.80955 13.3334H5.48574V14.0953H3.80955C2.75758 14.0953 1.90479 13.2425 1.90479 12.1905V10.5143Z" />+ <path d="M1.90479 9.67621H2.66669V6.32383H1.90479V9.67621Z" />+ <path d="M1.90479 5.48574H2.66669V3.80955C2.66669 3.17836 3.17836 2.66669 3.80955 2.66669H5.48574V1.90479H3.80955C2.75758 1.90479 1.90479 2.75758 1.90479 3.80955V5.48574Z" />+ <path d="M6.32383 1.90479V2.66669H9.67621V1.90479H6.32383Z" />+ <path d="M10.5143 1.90479V2.66669H12.1905C12.8217 2.66669 13.3334 3.17836 13.3334 3.80955V5.48574H14.0953V3.80955C14.0953 2.75758 13.2425 1.90479 12.1905 1.90479H10.5143Z" />+ <path d="M14.0953 6.32383H13.3334V6.85717H14.0953V6.32383Z" />+ <path d="M6.32383 13.3334H7.23812V14.0953H6.32383V13.3334Z" />+ <path+ fillRule="evenodd"+ clipRule="evenodd"+ d="M11.4286 6.85718C12.5592 7.98786 12.6772 9.74776 11.7824 11.0097L13.9482 13.1755L13.4094 13.7143L11.2712 11.576C10.0014 12.6889 8.06829 12.6398 6.85714 11.4286C5.59478 10.1662 5.59478 8.11954 6.85714 6.85718C8.1195 5.59482 10.1662 5.59482 11.4286 6.85718ZM10.8898 10.8899C11.8546 9.92503 11.8546 8.36075 10.8898 7.39593C9.92498 6.43111 8.3607 6.43111 7.39588 7.39593C6.43107 8.36075 6.43107 9.92503 7.39588 10.8899C8.3607 11.8547 9.92498 11.8547 10.8898 10.8899Z"+ />+ </svg>+ </Base>+ );+ }+}diff --git a/src/components/src/common/icons/effects/noise.tsx b/src/components/src/common/icons/effects/noise.tsxnew file mode 100644index 000000000..50469e4d4--- /dev/null+++ b/src/components/src/common/icons/effects/noise.tsx@@ -0,0 +1,60 @@+import React, {Component} from 'react';+import PropTypes from 'prop-types';+import Base from '../base';++export default class Noise extends Component {+ static propTypes = {+ /** Set the height of the icon, ex. '16px' */+ height: PropTypes.string+ };++ static defaultProps = {+ height: '16px',+ viewBox: '0 0 16 16',+ predefinedClassName: 'data-ex-icons-noise'+ };++ render() {+ return (+ <Base {...this.props}>+ <svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">+ <path d="M11.1778 5.42465C11.3485 5.24574 11.3403 4.96381 11.1594 4.79496C10.9786 4.6261 10.6937 4.63425 10.523 4.81316C10.3524 4.99208 10.3606 5.274 10.5414 5.44286C10.7222 5.61172 11.0072 5.60356 11.1778 5.42465Z" />+ <path d="M10.3358 5.65847C10.5166 5.82733 10.5248 6.10925 10.3542 6.28817C10.1835 6.46708 9.89856 6.47523 9.71775 6.30637C9.53693 6.13752 9.5287 5.85559 9.69936 5.67668C9.87003 5.49777 10.155 5.48961 10.3358 5.65847Z" />+ <path d="M9.53016 7.15179C9.70082 6.97287 9.69259 6.69095 9.51177 6.52209C9.33096 6.35323 9.04603 6.36139 8.87537 6.5403C8.7047 6.71921 8.71293 7.00114 8.89375 7.16999C9.07456 7.33885 9.35949 7.3307 9.53016 7.15179Z" />+ <path d="M8.70637 8.01541C8.87703 7.83649 8.8688 7.55457 8.68799 7.38571C8.50717 7.21685 8.22224 7.22501 8.05158 7.40392C7.88092 7.58283 7.88915 7.86476 8.06996 8.03361C8.25078 8.20247 8.53571 8.19432 8.70637 8.01541Z" />+ <path d="M10.4519 9.64561C10.6225 9.4667 10.6143 9.18477 10.4335 9.01591C10.2527 8.84706 9.96775 8.85521 9.79709 9.03412C9.62643 9.21303 9.63466 9.49496 9.81547 9.66382C9.99629 9.83267 10.2812 9.82452 10.4519 9.64561Z" />+ <path d="M9.57934 8.83043C9.75 8.65151 9.74177 8.36959 9.56096 8.20073C9.38014 8.03188 9.09521 8.04003 8.92455 8.21894C8.75389 8.39785 8.76212 8.67978 8.94293 8.84863C9.12375 9.01749 9.40868 9.00934 9.57934 8.83043Z" />+ <path d="M12.1976 11.276C12.3683 11.0971 12.36 10.8152 12.1792 10.6463C11.9984 10.4775 11.7135 10.4856 11.5428 10.6645C11.3722 10.8435 11.3804 11.1254 11.5612 11.2942C11.742 11.4631 12.0269 11.4549 12.1976 11.276Z" />+ <path d="M11.3251 10.4608C11.4957 10.2819 11.4875 10 11.3067 9.83115C11.1259 9.66229 10.8409 9.67044 10.6703 9.84936C10.4996 10.0283 10.5078 10.3102 10.6887 10.479C10.8695 10.6479 11.1544 10.6398 11.3251 10.4608Z" />+ <path d="M5.41102 11.4699C5.58168 11.291 5.57345 11.0091 5.39263 10.8402C5.21182 10.6713 4.92689 10.6795 4.75623 10.8584C4.58556 11.0373 4.59379 11.3192 4.77461 11.4881C4.95542 11.657 5.24035 11.6488 5.41102 11.4699Z" />+ <path d="M6.28388 12.285C6.45454 12.106 6.44631 11.8241 6.26549 11.6553C6.08468 11.4864 5.79975 11.4946 5.62909 11.6735C5.45843 11.8524 5.46666 12.1343 5.64747 12.3032C5.82829 12.472 6.11322 12.4639 6.28388 12.285Z" />+ <path d="M11.2574 8.15229C11.4382 8.32115 11.4464 8.60308 11.2758 8.78199C11.1051 8.9609 10.8202 8.96905 10.6394 8.8002C10.4586 8.63134 10.4503 8.34941 10.621 8.1705C10.7916 7.99159 11.0766 7.98344 11.2574 8.15229Z" />+ <path d="M7.98063 12.2367C8.15129 12.0578 8.14306 11.7758 7.96225 11.607C7.78143 11.4381 7.4965 11.4463 7.32584 11.6252C7.15518 11.8041 7.16341 12.086 7.34423 12.2549C7.52504 12.4237 7.80997 12.4156 7.98063 12.2367Z" />+ <path d="M10.4031 7.96697C10.5738 7.78805 10.5656 7.50613 10.3847 7.33727C10.2039 7.16842 9.919 7.17657 9.74833 7.35548C9.57767 7.53439 9.5859 7.81632 9.76672 7.98517C9.94753 8.15403 10.2325 8.14588 10.4031 7.96697Z" />+ <path d="M12.1486 9.59717C12.3193 9.41826 12.3111 9.13633 12.1303 8.96748C11.9494 8.79862 11.6645 8.80677 11.4938 8.98568C11.3232 9.1646 11.3314 9.44652 11.5122 9.61538C11.693 9.78423 11.978 9.77608 12.1486 9.59717Z" />+ <path d="M12.0997 7.91837C12.2703 7.73945 12.2621 7.45753 12.0813 7.28867C11.9005 7.11982 11.6155 7.12797 11.4449 7.30688C11.2742 7.48579 11.2824 7.76772 11.4633 7.93657C11.6441 8.10543 11.929 8.09728 12.0997 7.91837Z" />+ <path d="M6.21663 9.97657C6.39745 10.1454 6.40568 10.4274 6.23501 10.6063C6.06435 10.7852 5.77942 10.7933 5.59861 10.6245C5.41779 10.4556 5.40956 10.1737 5.58022 9.99478C5.75089 9.81587 6.03582 9.80772 6.21663 9.97657Z" />+ <path d="M7.08928 10.7916C7.2701 10.9605 7.27833 11.2424 7.10766 11.4213C6.937 11.6002 6.65207 11.6084 6.47126 11.4395C6.29044 11.2706 6.28221 10.9887 6.45287 10.8098C6.62354 10.6309 6.90847 10.6227 7.08928 10.7916Z" />+ <path d="M8.78625 10.7432C8.96706 10.9121 8.97529 11.194 8.80463 11.3729C8.63397 11.5518 8.34904 11.56 8.16822 11.3911C7.98741 11.2223 7.97918 10.9403 8.14984 10.7614C8.3205 10.5825 8.60543 10.5744 8.78625 10.7432Z" />+ <path d="M8.835 12.422C9.01582 12.5909 9.02405 12.8728 8.85339 13.0517C8.68272 13.2306 8.3978 13.2388 8.21698 13.0699C8.03617 12.9011 8.02794 12.6191 8.1986 12.4402C8.36926 12.2613 8.65419 12.2532 8.835 12.422Z" />+ <path d="M12.9052 6.42489C13.086 6.59375 13.0942 6.87568 12.9236 7.05459C12.7529 7.2335 12.468 7.24165 12.2872 7.0728C12.1063 6.90394 12.0981 6.62201 12.2688 6.4431C12.4394 6.26419 12.7244 6.25604 12.9052 6.42489Z" />+ <path d="M11.2085 6.47349C11.3893 6.64235 11.3976 6.92427 11.2269 7.10319C11.0562 7.2821 10.7713 7.29025 10.5905 7.12139C10.4097 6.95254 10.4015 6.67061 10.5721 6.4917C10.7428 6.31279 11.0277 6.30464 11.2085 6.47349Z" />+ <path d="M12.9541 8.10401C13.135 8.27287 13.1432 8.5548 12.9725 8.73371C12.8019 8.91262 12.5169 8.92077 12.3361 8.75192C12.1553 8.58306 12.1471 8.30113 12.3177 8.12222C12.4884 7.94331 12.7733 7.93516 12.9541 8.10401Z" />+ <path d="M9.60982 9.87969C9.79063 10.0486 9.79886 10.3305 9.6282 10.5094C9.45754 10.6883 9.17261 10.6965 8.9918 10.5276C8.81098 10.3587 8.80275 10.0768 8.97341 9.8979C9.14408 9.71899 9.429 9.71084 9.60982 9.87969Z" />+ <path d="M7.04052 9.11295C7.22134 9.28181 7.22957 9.56373 7.05891 9.74265C6.88824 9.92156 6.60331 9.92971 6.4225 9.76085C6.24168 9.592 6.23345 9.31007 6.40412 9.13116C6.57478 8.95225 6.85971 8.94409 7.04052 9.11295Z" />+ <path d="M7.93145 10.5577C8.10211 10.3788 8.09388 10.0968 7.91307 9.92797C7.73225 9.75912 7.44732 9.76727 7.27666 9.94618C7.106 10.1251 7.11423 10.407 7.29504 10.5759C7.47586 10.7447 7.76079 10.7366 7.93145 10.5577Z" />+ <path d="M9.65879 11.5582C9.8396 11.7271 9.84784 12.009 9.67717 12.1879C9.50651 12.3668 9.22158 12.375 9.04077 12.2061C8.85995 12.0373 8.85172 11.7554 9.02238 11.5764C9.19305 11.3975 9.47798 11.3894 9.65879 11.5582Z" />+ <path d="M12.0504 6.23973C12.221 6.06081 12.2128 5.77889 12.032 5.61003C11.8512 5.44118 11.5662 5.44933 11.3956 5.62824C11.2249 5.80715 11.2332 6.08908 11.414 6.25793C11.5948 6.42679 11.8797 6.41864 12.0504 6.23973Z" />+ <path d="M7.86399 8.24933C8.0448 8.41819 8.05303 8.70011 7.88237 8.87903C7.71171 9.05794 7.42678 9.06609 7.24597 8.89723C7.06515 8.72838 7.05692 8.44645 7.22758 8.26754C7.39825 8.08863 7.68317 8.08047 7.86399 8.24933Z" />+ <path d="M8.73706 9.06435C8.91788 9.23321 8.92611 9.51513 8.75545 9.69405C8.58478 9.87296 8.29986 9.88111 8.11904 9.71226C7.93823 9.5434 7.93 9.26147 8.10066 9.08256C8.27132 8.90365 8.55625 8.8955 8.73706 9.06435Z" />+ <path d="M10.4825 10.6946C10.6633 10.8634 10.6715 11.1453 10.5009 11.3243C10.3302 11.5032 10.0453 11.5113 9.86445 11.3425C9.68363 11.1736 9.6754 10.8917 9.84606 10.7128C10.0167 10.5339 10.3017 10.5257 10.4825 10.6946Z" />+ <path+ fillRule="evenodd"+ clipRule="evenodd"+ d="M13.9683 9.24363C13.9681 9.24476 13.9678 9.24589 13.9676 9.24701C13.9548 9.30874 13.941 9.37013 13.9263 9.43115C13.8392 9.79316 13.7198 10.1426 13.5713 10.4762C13.5665 10.487 13.5617 10.4977 13.5568 10.5084C13.4519 10.7406 13.3328 10.965 13.2007 11.1805C13.1462 11.2694 13.0896 11.3567 13.0307 11.4425C13.0248 11.4512 13.0188 11.4598 13.0129 11.4685C12.8486 11.7055 12.6679 11.9303 12.4724 12.1413C12.4037 12.2154 12.3332 12.2879 12.2609 12.3586C12.2599 12.3595 12.259 12.3605 12.258 12.3614C12.0451 12.5692 11.8171 12.7616 11.5758 12.9367C11.4884 13.0001 11.3993 13.0613 11.3085 13.12C11.3008 13.125 11.2931 13.13 11.2853 13.135C11.0803 13.2665 10.8668 13.386 10.646 13.4926C10.3589 13.6311 10.0594 13.7478 9.74949 13.8405C9.74659 13.8413 9.7437 13.8422 9.7408 13.8431C9.57194 13.8933 9.4 13.9364 9.22535 13.9721C9.08739 14.0002 8.94773 14.0237 8.80655 14.0424C8.79649 14.0437 8.78641 14.045 8.77633 14.0463C8.61254 14.0671 8.44671 14.0814 8.27913 14.089C8.18661 14.0932 8.09356 14.0953 8.00002 14.0953C7.44452 14.0953 6.90637 14.0209 6.39497 13.8817C6.37373 13.8759 6.35253 13.87 6.33138 13.864C6.06681 13.7889 5.80956 13.6963 5.56097 13.5877C3.40876 12.6469 1.90479 10.4991 1.90479 8.00002C1.90479 4.63372 4.63372 1.90479 8.00002 1.90479C10.4583 1.90479 12.5767 3.36009 13.5407 5.45615C13.5461 5.46795 13.5515 5.47977 13.5568 5.49161C13.6494 5.69632 13.731 5.90705 13.8008 6.12306C13.8384 6.23945 13.8727 6.35738 13.9034 6.47673C13.9523 6.66676 13.9922 6.86038 14.0228 7.05712C14.0705 7.36443 14.0953 7.67933 14.0953 8.00002C14.0953 8.00206 14.0953 8.0041 14.0953 8.00614C14.0952 8.03039 14.0951 8.05462 14.0948 8.0788C14.092 8.29577 14.0779 8.51001 14.0531 8.72095C14.0323 8.8976 14.0039 9.07194 13.9683 9.24363ZM7.38056 13.2978C7.55181 13.1246 7.83242 13.1185 8.01122 13.2855C8.02731 13.3005 8.04203 13.3164 8.05538 13.3331C8.41759 13.3294 8.77115 13.2896 9.11264 13.2171C9.2188 13.1303 9.35644 13.0988 9.48554 13.1237C9.62072 13.0846 9.75369 13.0403 9.88422 12.991C9.73278 12.8202 9.7348 12.5603 9.89556 12.3918C10.0662 12.2129 10.3512 12.2047 10.532 12.3736C10.6052 12.442 10.6501 12.5289 10.6663 12.6201C10.8669 12.5041 11.0592 12.3754 11.2421 12.2351C11.0789 12.3129 10.8773 12.288 10.7377 12.1576C10.5569 11.9888 10.5487 11.7069 10.7193 11.5279C10.89 11.349 11.1749 11.3409 11.3558 11.5097C11.5264 11.6691 11.5433 11.9291 11.4013 12.1082C11.9215 11.6771 12.3584 11.149 12.6844 10.5518C12.5767 10.5496 12.4694 10.5093 12.3849 10.4304C12.2041 10.2615 12.1958 9.97962 12.3665 9.8007C12.5372 9.62179 12.8221 9.61364 13.0029 9.7825C13.0094 9.78853 13.0156 9.7947 13.0216 9.80101C13.0609 9.69139 13.0968 9.58011 13.129 9.4673C13.031 9.30104 13.0504 9.08437 13.1907 8.9373C13.2126 8.91433 13.2364 8.89417 13.2616 8.87684C13.3088 8.59158 13.3334 8.29867 13.3334 8.00002C13.3334 7.99632 13.3334 7.99261 13.3333 7.9889C13.2705 7.96932 13.211 7.93573 13.1599 7.88798C12.9791 7.71912 12.9709 7.4372 13.1415 7.25828C13.1791 7.21894 13.2221 7.18785 13.2684 7.16509C13.1743 6.56694 12.9809 6.0018 12.7054 5.48711C12.5496 5.54486 12.3673 5.51456 12.2382 5.39394C12.0574 5.22508 12.0491 4.94316 12.2198 4.76425C12.2235 4.76033 12.2273 4.7565 12.2312 4.75275C12.1692 4.67217 12.105 4.5934 12.0387 4.51655C12.0274 4.53185 12.0151 4.54662 12.0016 4.56074C11.831 4.73965 11.546 4.7478 11.3652 4.57895C11.1844 4.41009 11.1762 4.12816 11.3468 3.94925C11.3656 3.9296 11.3857 3.91201 11.4069 3.89649C10.4829 3.12851 9.2954 2.66669 8.00002 2.66669C5.0545 2.66669 2.66669 5.0545 2.66669 8.00002C2.66669 9.39656 3.20345 10.6677 4.08192 11.6185C4.24183 11.5506 4.43414 11.5782 4.56875 11.7039C4.70268 11.8289 4.74192 12.016 4.68392 12.1774C4.78852 12.2605 4.89631 12.3398 5.00709 12.415C5.15522 12.3726 5.32155 12.4066 5.44182 12.5189C5.51107 12.5836 5.55501 12.6648 5.57327 12.7505C5.87702 12.906 6.19764 13.0332 6.53166 13.1287C6.52781 13.1253 6.52399 13.1219 6.52023 13.1184C6.33941 12.9495 6.33118 12.6676 6.50184 12.4887C6.67251 12.3097 6.95744 12.3016 7.13825 12.4704C7.31907 12.6393 7.3273 12.9212 7.15663 13.1001C7.09466 13.1651 7.01762 13.2076 6.93596 13.2272C7.08208 13.2568 7.23037 13.2804 7.38056 13.2978Z"+ />+ </svg>+ </Base>+ );+ }+}diff --git a/src/components/src/common/icons/effects/sepia.tsx b/src/components/src/common/icons/effects/sepia.tsxnew file mode 100644index 000000000..867a52e0b--- /dev/null+++ b/src/components/src/common/icons/effects/sepia.tsx@@ -0,0 +1,33 @@+import React, {Component} from 'react';+import PropTypes from 'prop-types';+import Base from '../base';++export default class Sepia extends Component {+ static propTypes = {+ /** Set the height of the icon, ex. '16px' */+ height: PropTypes.string+ };++ static defaultProps = {+ height: '16px',+ viewBox: '0 0 16 16',+ predefinedClassName: 'data-ex-icons-sepia'+ };++ render() {+ return (+ <Base {...this.props}>+ <svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">+ <path opacity="0.5" d="M1.90479 1.90479H14.0953V14.0953H1.90479V1.90479Z" />+ <path+ fillRule="evenodd"+ clipRule="evenodd"+ d="M13.3334 2.66669H2.66669V13.3334H13.3334V2.66669ZM1.90479 1.90479V14.0953H14.0953V1.90479H1.90479Z"+ />+ <path d="M6.92068 5.36513C6.92068 6.22424 6.22424 6.92068 5.36513 6.92068C4.50602 6.92068 3.80957 6.22424 3.80957 5.36513C3.80957 4.50602 4.50602 3.80957 5.36513 3.80957C6.22424 3.80957 6.92068 4.50602 6.92068 5.36513Z" />+ <path d="M5.3726 8.73856L2.28577 13.7143H13.3334V10.449L10.7339 6.09521L7.48465 11.5374L5.3726 8.73856Z" />+ </svg>+ </Base>+ );+ }+}diff --git a/src/components/src/common/icons/effects/tilt-shift.tsx b/src/components/src/common/icons/effects/tilt-shift.tsxnew file mode 100644index 000000000..3582d2001--- /dev/null+++ b/src/components/src/common/icons/effects/tilt-shift.tsx@@ -0,0 +1,41 @@+import React, {Component} from 'react';+import PropTypes from 'prop-types';+import Base from '../base';++export default class TiltShift extends Component {+ static propTypes = {+ /** Set the height of the icon, ex. '16px' */+ height: PropTypes.string+ };++ static defaultProps = {+ height: '16px',+ viewBox: '0 0 16 16',+ predefinedClassName: 'data-ex-icons-tilt-shift'+ };++ render() {+ return (+ <Base {...this.props}>+ <svg width="14" height="14" viewBox="0 0 14 14" xmlns="http://www.w3.org/2000/svg">+ <g clipPath="url(#clip0_129_11273)">+ <path d="M1.24084 2.58293L11.8227 1.24084L11.9186 1.99669L1.33671 3.33878L1.24084 2.58293Z" />+ <path d="M2.3837 11.7258L12.9656 10.3837L13.0615 11.1396L2.47956 12.4817L2.3837 11.7258Z" />+ <path d="M7.28677 3.68251L7.06069 3.85721L6.83861 3.67744C6.89358 3.60955 6.97657 3.57053 7.06392 3.57152C7.15126 3.5725 7.23336 3.61339 7.28677 3.68251Z" />+ <path d="M6.93947 8.90484C7.45111 8.90484 7.86588 8.49007 7.86588 7.97843H8.43731C8.43731 8.80567 7.7667 9.47627 6.93947 9.47627V8.90484Z" />+ <path+ fillRule="evenodd"+ clipRule="evenodd"+ d="M7.06069 3.85721C6.83861 3.67744 6.83861 3.67744 6.83861 3.67744L6.83673 3.67978L6.83191 3.68577L6.81385 3.70841C6.79819 3.72811 6.77545 3.75692 6.74666 3.79393C6.68907 3.86793 6.60717 3.97482 6.50904 4.10743C6.313 4.37237 6.05115 4.7414 5.7888 5.15692C5.52699 5.57156 5.26139 6.03764 5.06038 6.49608C4.86188 6.94883 4.71437 7.42054 4.71437 7.83882C4.71437 8.62009 4.96685 9.24753 5.40223 9.68015C5.83617 10.1113 6.42751 10.3247 7.06069 10.3247C8.36553 10.3247 9.407 9.3024 9.407 7.83882C9.407 7.44811 9.25753 6.9897 9.06043 6.54597C8.85994 6.09458 8.59503 5.62574 8.33383 5.20438C8.07206 4.7821 7.81078 4.40233 7.61518 4.12839C7.51727 3.99128 7.43558 3.88035 7.37819 3.80346C7.34949 3.76501 7.32685 3.73505 7.31128 3.71457L7.29334 3.69107L7.28859 3.68488L7.28677 3.68251C7.28677 3.68251 7.28677 3.68251 7.06069 3.85721ZM7.05609 4.32985C7.02874 4.36615 6.99942 4.40539 6.96839 4.44733C6.77807 4.70454 6.52476 5.06163 6.27197 5.462C6.01863 5.86323 5.76907 6.3028 5.58372 6.72554C5.39586 7.15399 5.2858 7.53902 5.2858 7.83882C5.2858 8.49369 5.49459 8.96636 5.80501 9.27481C6.11685 9.58468 6.55582 9.75331 7.06069 9.75331C8.03192 9.75331 8.83557 9.00512 8.83557 7.83882C8.83557 7.57205 8.72747 7.20403 8.53821 6.77793C8.35234 6.35949 8.1021 5.91512 7.84815 5.50545C7.59476 5.09669 7.34089 4.72761 7.15013 4.46046C7.1167 4.41364 7.08524 4.36999 7.05609 4.32985Z"+ />+ </g>+ <defs>+ <clipPath id="clip0_129_11273">+ <rect width="12.1905" height="12.1905" transform="translate(0.904785 0.904785)" />+ </clipPath>+ </defs>+ </svg>+ </Base>+ );+ }+}diff --git a/src/components/src/common/icons/effects/triangle-blur.tsx b/src/components/src/common/icons/effects/triangle-blur.tsxnew file mode 100644index 000000000..fd4b5b50a--- /dev/null+++ b/src/components/src/common/icons/effects/triangle-blur.tsx@@ -0,0 +1,39 @@+import React, {Component} from 'react';+import PropTypes from 'prop-types';+import Base from '../base';++export default class TriangleBlur extends Component {+ static propTypes = {+ /** Set the height of the icon, ex. '16px' */+ height: PropTypes.string+ };++ static defaultProps = {+ height: '16px',+ viewBox: '0 0 16 16',+ predefinedClassName: 'data-ex-icons-triangle-blur'+ };++ render() {+ return (+ <Base {...this.props}>+ <svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">+ <g clipPath="url(#clip0_129_11271)">+ <path d="M9.81261 2.05281L9.51117 2.28574L9.21508 2.04604C9.28836 1.95552 9.39902 1.90349 9.51548 1.90481C9.63194 1.90613 9.7414 1.96065 9.81261 2.05281Z" />+ <path d="M9.90479 11.8095C10.7464 11.8095 11.4286 11.1273 11.4286 10.2857H12.1905C12.1905 11.5481 11.1672 12.5715 9.90479 12.5715V11.8095Z" />+ <path+ fillRule="evenodd"+ clipRule="evenodd"+ d="M5.31629 10.2117C5.41417 11.391 5.85028 12.3392 6.53097 13.0156C7.30635 13.7861 8.36665 14.1714 9.51117 14.1714C11.8515 14.1714 13.727 12.3411 13.727 9.69573C13.727 9.00131 13.4598 8.17203 13.095 7.35087C12.7257 6.51951 12.2366 5.65342 11.7524 4.87233C11.2675 4.09001 10.7832 3.38606 10.4204 2.87804C10.2389 2.62384 10.0875 2.41824 9.98124 2.27589C9.9281 2.2047 9.88623 2.1493 9.85751 2.11152C9.84314 2.09262 9.83206 2.07813 9.8245 2.06827L9.81583 2.05698L9.8129 2.05317C9.81284 2.0531 9.81261 2.05281 9.51117 2.28574C9.21508 2.04604 9.21514 2.04597 9.21508 2.04604L9.21178 2.05013L9.20302 2.06103C9.1954 2.07052 9.18427 2.08445 9.16984 2.1026C9.141 2.1389 9.09901 2.19211 9.04574 2.26056C8.93923 2.39743 8.78754 2.59539 8.60573 2.8411C8.2424 3.33212 7.75734 4.01576 7.2716 4.78506C7.03523 5.15943 6.79766 5.5557 6.57337 5.96129H3.64893V6.72319H6.17508C6.0877 6.90131 6.00448 7.07971 5.92658 7.25738C5.86124 7.4064 5.79914 7.55602 5.7412 7.70552H2.77681V8.46742H5.48518C5.391 8.80484 5.32702 9.13517 5.30439 9.44975H1.90479V10.2117H5.31629ZM6.08112 10.2117C6.17573 11.2042 6.54449 11.955 7.068 12.4751C7.68059 13.0838 8.53773 13.4095 9.51117 13.4095C11.4067 13.4095 12.9651 11.9447 12.9651 9.69573C12.9651 9.16656 12.753 8.4578 12.3987 7.66016C12.049 6.87272 11.5794 6.03926 11.1048 5.27376C10.6311 4.50947 10.1566 3.81977 9.80035 3.32079C9.68897 3.16481 9.58927 3.02765 9.50489 2.91287C9.42245 3.02077 9.32579 3.14889 9.2182 3.29429C8.86249 3.77502 8.38882 4.44273 7.91584 5.19183C7.75831 5.44132 7.60134 5.69907 7.44915 5.96129H10.5061V6.72319H7.02889C6.88272 7.00381 6.74625 7.28533 6.62436 7.56332C6.60348 7.61095 6.58308 7.65836 6.56318 7.70552H9.63395V8.46742H6.28002C6.16879 8.82013 6.09558 9.15066 6.06871 9.44975H8.76193V10.2117H6.08112Z"+ />+ </g>+ <defs>+ <clipPath id="clip0_129_11271">+ <rect width="16" height="16" />+ </clipPath>+ </defs>+ </svg>+ </Base>+ );+ }+}diff --git a/src/components/src/common/icons/effects/vibrance.tsx b/src/components/src/common/icons/effects/vibrance.tsxnew file mode 100644index 000000000..a0971a554--- /dev/null+++ b/src/components/src/common/icons/effects/vibrance.tsx@@ -0,0 +1,37 @@+import React, {Component} from 'react';+import PropTypes from 'prop-types';+import Base from '../base';++export default class Vibrance extends Component {+ static propTypes = {+ /** Set the height of the icon, ex. '16px' */+ height: PropTypes.string+ };++ static defaultProps = {+ height: '16px',+ viewBox: '0 0 16 16',+ predefinedClassName: 'data-ex-icons-vibrance'+ };++ render() {+ return (+ <Base {...this.props}>+ <svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">+ <g clipPath="url(#clip0_129_11266)">+ <path+ fillRule="evenodd"+ clipRule="evenodd"+ d="M8.19047 14.0953L1.5238 1.90479L14.8571 1.90479L8.19047 14.0953ZM10.6483 8.01305L8.19047 12.5073L5.73266 8.01305C6.32652 8.70473 7.20733 9.14288 8.19047 9.14288C9.17361 9.14288 10.0544 8.70473 10.6483 8.01305ZM11.2935 6.83324L13.5721 2.66669L8.19332 2.66669C9.98036 2.66823 11.4286 4.11738 11.4286 5.90478C11.4286 6.22747 11.3814 6.53913 11.2935 6.83324ZM8.18762 2.66669L2.80887 2.66669L5.08745 6.83325C4.99958 6.53914 4.95238 6.22747 4.95238 5.90478C4.95238 4.11738 6.40058 2.66823 8.18762 2.66669Z"+ />+ </g>+ <defs>+ <clipPath id="clip0_129_11266">+ <rect width="16" height="16" />+ </clipPath>+ </defs>+ </svg>+ </Base>+ );+ }+}diff --git a/src/components/src/common/icons/effects/vignette.tsx b/src/components/src/common/icons/effects/vignette.tsxnew file mode 100644index 000000000..19d1e8f3b--- /dev/null+++ b/src/components/src/common/icons/effects/vignette.tsx@@ -0,0 +1,30 @@+import React, {Component} from 'react';+import PropTypes from 'prop-types';+import Base from '../base';++export default class Vignette extends Component {+ static propTypes = {+ /** Set the height of the icon, ex. '16px' */+ height: PropTypes.string+ };++ static defaultProps = {+ height: '16px',+ viewBox: '0 0 16 16',+ predefinedClassName: 'data-ex-icons-vignette'+ };++ render() {+ return (+ <Base {...this.props}>+ <svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">+ <path+ fillRule="evenodd"+ clipRule="evenodd"+ d="M14.0953 1.90479H1.90479V14.0953H14.0953V1.90479ZM8.00002 13.7566C11.1793 13.7566 13.7566 11.1793 13.7566 8.00002C13.7566 4.82073 11.1793 2.24341 8.00002 2.24341C4.82073 2.24341 2.24341 4.82073 2.24341 8.00002C2.24341 11.1793 4.82073 13.7566 8.00002 13.7566Z"+ />+ </svg>+ </Base>+ );+ }+}diff --git a/src/components/src/common/icons/effects/zoom-blur.tsx b/src/components/src/common/icons/effects/zoom-blur.tsxnew file mode 100644index 000000000..47e8d9d78--- /dev/null+++ b/src/components/src/common/icons/effects/zoom-blur.tsx@@ -0,0 +1,51 @@+import React, {Component} from 'react';+import PropTypes from 'prop-types';+import Base from '../base';++export default class ZoomBlur extends Component {+ static propTypes = {+ /** Set the height of the icon, ex. '16px' */+ height: PropTypes.string+ };++ static defaultProps = {+ height: '16px',+ viewBox: '0 0 16 16',+ predefinedClassName: 'data-ex-icons-zoom-blur'+ };++ render() {+ return (+ <Base {...this.props}>+ <svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">+ <g clipPath="url(#clip0_129_11272)">+ <path d="M14.0436 8.79612C14.0776 8.53557 14.0951 8.26984 14.0951 8.00002C14.0951 7.7302 14.0776 7.46448 14.0436 7.20393L13.2881 7.30248C13.3179 7.53044 13.3332 7.76324 13.3332 8.00002C13.3332 8.2368 13.3179 8.46961 13.2881 8.69757L14.0436 8.79612Z" />+ <path d="M13.6326 5.66684C13.4271 5.17131 13.1582 4.70876 12.8359 4.28934L12.2317 4.75359C12.5139 5.12082 12.7492 5.52552 12.9288 5.95869L13.6326 5.66684Z" />+ <path d="M11.7106 3.16406C11.2912 2.84175 10.8286 2.57278 10.3331 2.36729L10.0412 3.07109C10.4744 3.25072 10.8791 3.48599 11.2463 3.76819L11.7106 3.16406Z" />+ <path d="M8.796 1.9563C8.53544 1.92232 8.26972 1.90479 7.9999 1.90479C7.73008 1.90479 7.46436 1.92232 7.20381 1.9563L7.30236 2.71181C7.53032 2.68207 7.76312 2.66669 7.9999 2.66669C8.23668 2.66669 8.46949 2.68207 8.69745 2.71181L8.796 1.9563Z" />+ <path d="M5.66672 2.3673C5.17119 2.57278 4.70864 2.84175 4.28922 3.16406L4.75347 3.76819C5.1207 3.48599 5.5254 3.25072 5.95857 3.07109L5.66672 2.3673Z" />+ <path d="M3.16394 4.28934C2.84163 4.70876 2.57266 5.17131 2.36717 5.66684L3.07096 5.95869C3.25059 5.52552 3.48587 5.12083 3.76807 4.75359L3.16394 4.28934Z" />+ <path d="M1.90466 8.00002C1.90466 7.7302 1.92219 7.46448 1.95618 7.20393L2.71169 7.30248C2.68195 7.53044 2.66657 7.76324 2.66657 8.00002C2.66657 8.2368 2.68195 8.46961 2.71169 8.69757L1.95618 8.79612C1.9222 8.53557 1.90466 8.26984 1.90466 8.00002Z" />+ <path d="M2.36717 10.3332C2.57266 10.8287 2.84163 11.2913 3.16394 11.7107L3.76807 11.2465C3.48587 10.8792 3.25059 10.4745 3.07096 10.0414L2.36717 10.3332Z" />+ <path d="M4.28922 12.836C4.70864 13.1583 5.17119 13.4273 5.66672 13.6328L5.95857 12.929C5.5254 12.7493 5.1207 12.5141 4.75347 12.2319L4.28922 12.836Z" />+ <path d="M7.20381 14.0437C7.46436 14.0777 7.73008 14.0953 7.9999 14.0953C8.26972 14.0953 8.53544 14.0777 8.796 14.0437L8.69745 13.2882C8.46949 13.318 8.23668 13.3334 7.9999 13.3334C7.76312 13.3334 7.53032 13.318 7.30236 13.2882L7.20381 14.0437Z" />+ <path d="M10.3331 13.6328C10.8286 13.4273 11.2912 13.1583 11.7106 12.836L11.2463 12.2319C10.8791 12.5141 10.4744 12.7493 10.0412 12.929L10.3331 13.6328Z" />+ <path d="M12.8359 11.7107C13.1582 11.2913 13.4271 10.8287 13.6326 10.3332L12.9288 10.0414C12.7492 10.4745 12.5139 10.8792 12.2317 11.2465L12.8359 11.7107Z" />+ <path d="M8.28668 4.68247L8.0606 4.85717L7.83853 4.6774C7.89349 4.6095 7.97649 4.57048 8.06383 4.57147C8.15118 4.57246 8.23327 4.61335 8.28668 4.68247Z" />+ <path d="M7.93939 9.90479C8.45103 9.90479 8.86579 9.49003 8.86579 8.97839H9.43722C9.43722 9.80562 8.76662 10.4762 7.93939 10.4762V9.90479Z" />+ <path+ fillRule="evenodd"+ clipRule="evenodd"+ d="M8.0606 4.85717C7.83853 4.6774 7.83857 4.67735 7.83853 4.6774L7.83796 4.6781L7.83664 4.67973L7.83182 4.68573L7.81376 4.70836C7.7981 4.72807 7.77537 4.75687 7.74657 4.79388C7.68898 4.86788 7.60708 4.97477 7.50895 5.10739C7.31292 5.37232 7.05107 5.74136 6.78871 6.15687C6.5269 6.57152 6.2613 7.0376 6.0603 7.49604C5.86179 7.94878 5.71428 8.42049 5.71428 8.83877C5.71428 9.62005 5.96677 10.2475 6.40214 10.6801C6.83609 11.1113 7.42742 11.3247 8.0606 11.3247C9.36544 11.3247 10.4069 10.3023 10.4069 8.83877C10.4069 8.44807 10.2574 7.98965 10.0603 7.54592C9.85985 7.09454 9.59494 6.62569 9.33374 6.20433C9.07197 5.78205 8.81069 5.40228 8.61509 5.12835C8.51719 4.99124 8.43549 4.8803 8.3781 4.80341C8.3494 4.76496 8.32676 4.735 8.31119 4.71452L8.29326 4.69102L8.2885 4.68483L8.28668 4.68247C8.28664 4.68242 8.28668 4.68247 8.0606 4.85717ZM8.056 5.32981C8.02866 5.36611 7.99933 5.40535 7.9683 5.44728C7.77798 5.7045 7.52468 6.06158 7.27188 6.46195C7.01854 6.86319 6.76899 7.30275 6.58363 7.7255C6.39578 8.15394 6.28571 8.53897 6.28571 8.83877C6.28571 9.49365 6.4945 9.96631 6.80492 10.2748C7.11677 10.5846 7.55573 10.7533 8.0606 10.7533C9.03184 10.7533 9.83549 10.0051 9.83549 8.83877C9.83549 8.572 9.72738 8.20398 9.53812 7.77789C9.35225 7.35945 9.10201 6.91507 8.84806 6.5054C8.59468 6.09665 8.34081 5.72756 8.15005 5.46041C8.11661 5.41359 8.08515 5.36994 8.056 5.32981Z"+ />+ </g>+ <defs>+ <clipPath id="clip0_129_11272">+ <rect width="16" height="16" />+ </clipPath>+ </defs>+ </svg>+ </Base>+ );+ }+}diff --git a/src/components/src/common/icons/index.tsx b/src/components/src/common/icons/index.tsxindex 059bfb9c1..dafb7d662 100644--- a/src/components/src/common/icons/index.tsx+++ b/src/components/src/common/icons/index.tsx@@ -96,4 +96,24 @@ export {default as Messages} from './messages';export {default as Crosshairs} from './crosshairs';export {default as CursorClick} from './cursor-click';export {default as CursorPoint} from './cursor-point';-export {default as Pin} from './pin';\ No newline at end of file+export {default as Pin} from './pin';+export {default as Calendar} from './calendar';+export {default as LocationMarker} from './location-marker';+export {default as ArrowDownSmall} from './arrow-down-small';+export {default as MagicWand} from './effects/magic-wand';+export {default as LightAndShadowEffectIcon} from './effects/light-and-shadow';+export {default as InkEffectIcon} from './effects/ink';+export {default as BrightnessContrastEffectIcon} from './effects/brightness-contrast';+export {default as HueSaturationEffectIcon} from './effects/hue-saturation';+export {default as VibranceEffectIcon} from './effects/vibrance';+export {default as SepiaEffectIcon} from './effects/sepia';+export {default as DotScreenEffectIcon} from './effects/dot-screen';+export {default as ColorHalftoneEffectIcon} from './effects/color-halftone';+export {default as NoiseEffectIcon} from './effects/noise';+export {default as TriangleBlurEffectIcon} from './effects/triangle-blur';+export {default as ZoomBlurEffectIcon} from './effects/zoom-blur';+export {default as TiltShiftEffectIcon} from './effects/tilt-shift';+export {default as EdgeWorkEffectIcon} from './effects/edge-work';+export {default as VignetteEffectIcon} from './effects/vignette';+export {default as MagnifyEffectIcon} from './effects/magnify';+export {default as HexagonalPixelateEffectIcon} from './effects/hexagonal-pixelate';diff --git a/src/components/src/common/icons/location-marker.tsx b/src/components/src/common/icons/location-marker.tsxnew file mode 100644index 000000000..6fb0ff35e--- /dev/null+++ b/src/components/src/common/icons/location-marker.tsx@@ -0,0 +1,33 @@+import React, {Component} from 'react';+import PropTypes from 'prop-types';+import Base from './base';++export default class LocationMarker extends Component {+ static propTypes = {+ /** Set the height of the icon, ex. '16px' */+ height: PropTypes.string+ };++ static defaultProps = {+ height: '16px',+ viewBox: '0 0 16 16',+ predefinedClassName: 'data-ex-icons-location-marker'+ };++ render() {+ return (+ <Base {...this.props}>+ <svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">+ <g clipPath="url(#clip0_118_4762)">+ <path d="M15 7.5H11.965C11.8528 6.62017 11.4517 5.80249 10.8246 5.17529C10.1975 4.54809 9.37982 4.14689 8.5 4.03465V1H7.5V4.03465C6.62018 4.14689 5.80254 4.54809 5.17541 5.17529C4.54827 5.80249 4.14715 6.62017 4.035 7.5H1V8.5H4.035C4.14715 9.37983 4.54827 10.1975 5.17541 10.8247C5.80254 11.4519 6.62018 11.8531 7.5 11.9654V15H8.5V11.9654C9.37986 11.8532 10.1976 11.452 10.8247 10.8248C11.4519 10.1976 11.8531 9.37986 11.9653 8.5H15V7.5ZM8 11C7.40666 11 6.82664 10.8241 6.33329 10.4944C5.83994 10.1648 5.45542 9.69623 5.22836 9.14805C5.0013 8.59987 4.94189 7.99667 5.05764 7.41473C5.1734 6.83279 5.45912 6.29824 5.87868 5.87868C6.29824 5.45912 6.83279 5.1734 7.41473 5.05764C7.99667 4.94189 8.59987 5.0013 9.14805 5.22836C9.69623 5.45542 10.1648 5.83994 10.4944 6.33329C10.8241 6.82664 11 7.40666 11 8C10.9991 8.79538 10.6828 9.55794 10.1204 10.1204C9.55794 10.6828 8.79538 10.9991 8 11Z" />+ </g>+ <defs>+ <clipPath id="clip0_118_4762">+ <rect width="16" height="16" />+ </clipPath>+ </defs>+ </svg>+ </Base>+ );+ }+}diff --git a/src/components/src/common/item-selector/item-selector.tsx b/src/components/src/common/item-selector/item-selector.tsxindex f290a87e6..6b1330d39 100644--- a/src/components/src/common/item-selector/item-selector.tsx+++ b/src/components/src/common/item-selector/item-selector.tsx@@ -148,6 +148,7 @@ export type ItemSelectorProps = {placeholder?: string;closeOnSelect?: boolean;typeaheadPlaceholder?: string;+ DropDownWrapperComponent?: ComponentType<any> | null;DropdownHeaderComponent?: ComponentType<any> | null;DropDownRenderComponent?: ComponentType<any>;DropDownLineItemRenderComponent?: ComponentType<any>;@@ -166,6 +167,7 @@ class ItemSelectorUnmemoized extends Component<ItemSelectorProps> {searchable: true,DropDownRenderComponent: DropdownList,DropDownLineItemRenderComponent: ListItem,+ DropDownWrapperComponent: DropdownWrapper,reorderItems: undefined};@@ -277,9 +279,13 @@ class ItemSelectorUnmemoized extends Component<ItemSelectorProps> {const {placement = 'bottom'} = this.props;const {dimensions} = this.state;+ const DropDownWrapperComponent = this.props.DropDownWrapperComponent as React.ComponentType<+ any+ >;+return (<Portaled left={0} top={0} isOpened={this.state.showTypeahead} onClose={this._hideTypeahead}>- <DropdownWrapper placement={placement} width={dimensions?.width}>+ <DropDownWrapperComponent placement={placement} width={dimensions?.width}><TypeaheadcustomClasses={{results: 'list-selector',@@ -306,7 +312,7 @@ class ItemSelectorUnmemoized extends Component<ItemSelectorProps> {selectedItems={toArray(this.props.selectedItems)}light={this.props.inputTheme === 'light'}/>- </DropdownWrapper>+ </DropDownWrapperComponent></Portaled>);}diff --git a/src/components/src/common/range-slider.tsx b/src/components/src/common/range-slider.tsxindex 9a9ae3cf6..614e67272 100644--- a/src/components/src/common/range-slider.tsx+++ b/src/components/src/common/range-slider.tsx@@ -63,7 +63,7 @@ interface RangeSliderProps {range?: number[];value0: number;value1: number;- onChange?: (val: number[]) => void; // TODO+ onChange?: (val: number[], e?: Event | null) => void; // TODOhistogram?: any[];isRanged?: boolean;isEnlarged?: boolean;diff --git a/src/components/src/common/styled-components.tsx b/src/components/src/common/styled-components.tsxindex 9a1392f01..0b87c5aad 100644--- a/src/components/src/common/styled-components.tsx+++ b/src/components/src/common/styled-components.tsx@@ -787,9 +787,9 @@ export const StyledTimePicker = styled(TimePicker)`display: inline-flex;position: relative;font-family: ${props => props.theme.fontFamily};- font-size: ${props => props.theme.datePickerFontSize};- background-color: ${props => props.theme.datePickerBgdColor};- color: ${props => props.theme.textColor};+ font-size: ${props => props.theme.inputFontSize};+ background-color: ${props => props.theme.inputBgd};+ color: ${props => props.theme.effectPanelTextMain};}.react-time-picker,.react-time-picker *,@@ -803,20 +803,23 @@ export const StyledTimePicker = styled(TimePicker)`display: flex;flex-grow: 1;flex-shrink: 0;- background-color: ${props => props.theme.datePickerBgdColor};- border: thin solid ${props => props.theme.datePickerBgdColor};- border-radius: 2px;- width: 103px;+ background-color: ${props => props.theme.inputBgd};+ border-radius: 4px;+ width: 110px;white-space: nowrap;}.react-time-picker__wrapper:hover {- background-color: ${props => props.theme.datePickerBgdHover};+ background-color: ${props => props.theme.inputBgdHover};}.react-time-picker__inputGroup {min-width: calc((4px * 3) + 0.54em * 6 + 0.217em * 2);flex-grow: 1;- padding: 4px 10px;+ padding: 4px 2px;box-sizing: content-box;+ display: flex;+ justify-content: end;+ align-items: center;+ height: 24px;}.react-time-picker__inputGroup__divider {padding: 1px 0;@@ -825,9 +828,9 @@ export const StyledTimePicker = styled(TimePicker)`.react-time-picker__inputGroup__divider,.react-time-picker__inputGroup__leadingZero {display: inline-block;- color: ${props => props.theme.textColor};+ color: ${props => props.theme.effectPanelTextMain};font-family: ${props => props.theme.fontFamily};- font-size: ${props => props.theme.datePickerFontSize};+ font-size: ${props => props.theme.inputFontSize};}.react-time-picker__inputGroup__input {min-width: 0.54em;@@ -836,9 +839,9 @@ export const StyledTimePicker = styled(TimePicker)`padding: 0 1px;border: 0;background: transparent;- color: ${props => props.theme.textColor};+ color: ${props => props.theme.effectPanelTextMain};font-family: ${props => props.theme.fontFamily};- font-size: ${props => props.theme.datePickerFontSize};+ font-size: ${props => props.theme.inputFontSize};box-sizing: content-box;-webkit-appearance: textfield;-moz-appearance: textfield;@@ -859,15 +862,16 @@ export const StyledTimePicker = styled(TimePicker)`padding-left: calc(1px + 0.54em);}.react-time-picker__inputGroup__amPm {+ max-width: 37px;font: inherit;-webkit-appearance: menulist;-moz-appearance: menulist;appearance: menulist;- font-size: ${props => props.theme.datePickerFontSize};+ font-size: ${props => props.theme.inputFontSize};}.react-time-picker__button {border: 0;- background-color: ${props => props.theme.datePickerBgdColor};+ background-color: ${props => props.theme.inputBgd};padding: 4px 6px;}.react-time-picker__button:enabled {@@ -887,7 +891,7 @@ export const StyledDatePicker = styled(DatePicker)`display: inline-flex;position: relative;font-family: ${props => props.theme.fontFamily};- font-size: ${props => props.theme.datePickerFontSize};+ font-size: ${props => props.theme.inputFontSize};}.react-date-picker,.react-date-picker *,@@ -905,26 +909,30 @@ export const StyledDatePicker = styled(DatePicker)`display: flex;flex-grow: 1;flex-shrink: 0;- border: thin solid ${props => props.theme.datePickerBgdColor};- border-radius: 2px;- width: 90px;+ width: 110px;white-space: nowrap;+ border-radius: 4px;}.react-date-picker__inputGroup {min-width: calc((4px * 3) + 0.54em * 8 + 0.217em * 2);flex-grow: 1;- padding: 4px 10px;+ padding: 4px 9px;box-sizing: content-box;- background-color: ${props => props.theme.datePickerBgdColor};+ background-color: ${props => props.theme.inputBgd};+ display: flex;+ justify-content: end;+ align-items: center;+ height: 24px;+ border-radius: 4px;}.react-date-picker__inputGroup:hover {- background-color: ${props => props.theme.datePickerBgdHover};+ background-color: ${props => props.theme.inputBgdHover};}.react-date-picker__inputGroup__divider {padding: 1px 0;white-space: pre;- color: ${props => props.theme.textColor};+ color: ${props => props.theme.effectPanelTextMain};}.react-date-picker__inputGroup__divider,.react-date-picker__inputGroup__leadingZero {@@ -937,9 +945,9 @@ export const StyledDatePicker = styled(DatePicker)`padding: 0 1px;border: 0;background: none;- color: ${props => props.theme.textColor};+ color: ${props => props.theme.effectPanelTextMain};font: inherit;- font-size: ${props => props.theme.datePickerFontSize};+ font-size: ${props => props.theme.inputFontSize};box-sizing: content-box;-webkit-appearance: textfield;-moz-appearance: textfield;@@ -956,7 +964,7 @@ export const StyledDatePicker = styled(DatePicker)`margin: 0;}.react-date-picker__inputGroup__input:invalid {- background: ${props => props.theme.datePickerBgdColor};+ background: ${props => props.theme.inputBgd};}.react-date-picker__inputGroup__input--hasLeadingZero {margin-left: -0.54em;@@ -966,8 +974,7 @@ export const StyledDatePicker = styled(DatePicker)`width: 257px;max-width: 100vw;z-index: 11;- inset: auto auto auto -25px !important;- color: ${props => props.theme.textColor};+ color: ${props => props.theme.effectPanelTextSecondary1};}.react-date-picker__calendar--closed {display: none;@@ -979,14 +986,14 @@ export const StyledDatePicker = styled(DatePicker)`display: none;}.react-calendar {- width: 257px;+ width: 256px;max-width: 100%;- color: ${props => props.theme.textColor};- background: ${props => props.theme.datePickerBgdHover};- border: 1px solid ${props => props.theme.textColor};- border-radius: 2px;+ color: ${props => props.theme.effectPanelTextSecondary1};+ background: ${props => props.theme.inputBgdHover};+ border-radius: 0px 4px 4px 4px;font-family: ${props => props.theme.fontFamily};line-height: 1.125em;+ padding: 16px;}.react-calendar,.react-calendar *,@@ -1002,7 +1009,7 @@ export const StyledDatePicker = styled(DatePicker)`outline: none;}.react-calendar buttom:enabled {- color: ${props => props.theme.primaryBtnActColor};+ color: ${props => props.theme.effectPanelTextMain};}.react-calendar button:enabled:hover {cursor: pointer;@@ -1026,8 +1033,12 @@ export const StyledDatePicker = styled(DatePicker)`font-weight: bold;}.react-calendar__month-view__weekdays__weekday {+ color: ${props => props.theme.effectPanelTextSecondary2};padding: 0.5em;- font-size: ${props => props.theme.datePickerFontSize};+ font-size: ${props => props.theme.inputFontSize};+ abbr {+ text-decoration: none;+ }}.react-calendar__month-view__weekNumbers .react-calendar__tile {display: flex;@@ -1036,15 +1047,15 @@ export const StyledDatePicker = styled(DatePicker)`font-weight: bold;}.react-calendar__month-view__days__day--weekend {- color: ${props => props.theme.textColor};+ color: ${props => props.theme.effectPanelTextSecondary1};}.react-calendar__month-view__days__day--neighboringMonth {- color: ${props => props.theme.textColor};+ color: ${props => props.theme.effectPanelTextSecondary3};opacity: 0.4;}.react-calendar__navigation__label__labelText,.react-calendar__navigation__arrow {- color: ${props => props.theme.textColor};+ color: ${props => props.theme.effectPanelTextMain};}.react-calendar__year-view .react-calendar__tile,.react-calendar__decade-view .react-calendar__tile,@@ -1052,22 +1063,23 @@ export const StyledDatePicker = styled(DatePicker)`padding: 2em 0.5em;}.react-calendar__tile {- color: ${props => props.theme.textColor};+ color: ${props => props.theme.effectPanelTextSecondary1};max-width: 100%;padding: 6px 4px;background: none;text-align: center;- font-size: ${props => props.theme.datePickerFontSize};+ font-size: ${props => props.theme.inputFontSize};+ height: 30px;}.react-calendar__tile:enabled:hover,.react-calendar__tile:enabled:focus {- background-color: ${props => props.theme.datePickerSelectedDateBgColor};+ background-color: ${props => props.theme.primaryBtnBgd};color: ${props => props.theme.primaryBtnActColor};}.react-calendar__tile--now:enabled:hover,.react-calendar__tile--now:enabled:focus {- background: ${props => props.theme.datePickerSelectedDateBgColor};- color: ${props => props.theme.primaryBtnActColor};+ background: ${props => props.theme.primaryBtnBgd};+ color: ${props => props.theme.effectPanelTextMain};}.react-calendar__tile--hasActive {background: ${props => props.theme.primaryBtnActBgd};@@ -1075,17 +1087,18 @@ export const StyledDatePicker = styled(DatePicker)`.react-calendar__tile--hasActive:enabled:hover,.react-calendar__tile--hasActive:enabled:focus {background: ${props => props.theme.primaryBtnActBgd};- color: ${props => props.theme.primaryBtnActColor};+ color: ${props => props.theme.effectPanelTextMain};}.react-calendar__tile--active {background: ${props => props.theme.primaryBtnActBgd};- color: ${props => props.theme.primaryBtnActColor};+ color: ${props => props.theme.effectPanelTextMain};+ border-radius: 4px;}.react-calendar__tile--active:enabled:hover,.react-calendar__tile--active:enabled:focus {background: ${props => props.theme.primaryBtnActBgd};}.calendar__navigation__label__labelText {- сolor: ${props => props.theme.textColor};+ сolor: ${props => props.theme.effectPanelTextMain};}`;diff --git a/src/components/src/effects/compact-color-picker.tsx b/src/components/src/effects/compact-color-picker.tsxnew file mode 100644index 000000000..7c3d614b2--- /dev/null+++ b/src/components/src/effects/compact-color-picker.tsx@@ -0,0 +1,139 @@+import React, {useCallback, useMemo} from 'react';+import styled from 'styled-components';++import {rgbToHex} from '@kepler.gl/utils';++import {Portaled, SingleColorPalette} from '../../../components';+import {Button} from '../common/styled-components';++export type SingleColorPickerProps = {+ color: [number, number, number];+ onSetColor: (value: [number, number, number]) => void;+ label: string;+ Icon: React.ElementType;+};++export const StyledPanelDropdown = styled.div`+ ${props => props.theme.panelDropdownScrollBar}+ background-color: ${props => props.theme.panelBackground};+ box-shadow: ${props => props.theme.panelBoxShadow};+ border-radius: ${props => props.theme.panelBorderRadius};+ overflow-y: auto;+ max-height: 500px;+ position: relative;+ z-index: 999;+ width: 220px;+`;++const StyledConfigSection = styled.div`+ display: flex;+ flex-direction: column;+`;++const SectionTitle = styled.div`+ font-size: ${props => props.theme.inputFontSize};+ color: ${props => props.theme.effectPanelTextSecondary2};+ margin-bottom: 8px;+`;++const StyledDropdownButtonWrapper = styled.div`+ align-self: flex-start;+ .button {+ color: ${props => props.theme.effectPanelTextSecondary2};+ display: flex;+ gap: 5px;+ border: none;+ transition: background 0.2s;+ background-color: ${props => props.theme.inputBgd};+ padding: 8px 5px 8px 10px;+ &:active {+ color: ${props => props.theme.effectPanelTextMain};+ background-color: ${props => props.theme.inputBgdHover};+ }+ &:hover {+ color: ${props => props.theme.effectPanelTextMain};+ background-color: ${props => props.theme.inputBgdHover};+ }+ & > svg {+ margin-right: 0;+ }+ }+`;++const DEFAULT_OFFSET = {+ top: 0,+ left: 0+};++const SingleColorPickerDropdown = ({+ isOpened,+ onClose,+ selectedColor,+ onSelectColor,+ offset = DEFAULT_OFFSET+}) => {+ const onSelectColorCb = useCallback(+ v => {+ onSelectColor(v);+ },+ [onSelectColor]+ );+ return (+ <Portaled top={offset.top} left={offset.left} isOpened={isOpened} onClose={onClose}>+ <StyledPanelDropdown>+ <SingleColorPalette selectedColor={selectedColor} onSelectColor={onSelectColorCb} />+ </StyledPanelDropdown>+ </Portaled>+ );+};++const CompactColorPicker: React.FC<SingleColorPickerProps> = ({+ color,+ onSetColor,+ Icon,+ label+}: SingleColorPickerProps) => {+ const [isColorPickerOpened, setIsColorPickerOpened] = React.useState(false);++ const hexColor = useMemo(() => {+ return rgbToHex(color);+ }, [color]);++ const colorBlockStyle = useMemo(+ () => ({+ width: 16,+ height: 16,+ backgroundColor: hexColor,+ borderRadius: 2+ }),+ [hexColor]+ );++ const toggleDropdown = useCallback(() => {+ setIsColorPickerOpened(!isColorPickerOpened);+ }, [isColorPickerOpened, setIsColorPickerOpened]);++ const closeDropdown = useCallback(() => {+ setIsColorPickerOpened(false);+ }, [setIsColorPickerOpened]);++ return (+ <StyledConfigSection>+ <SectionTitle>{label}</SectionTitle>+ <StyledDropdownButtonWrapper>+ <Button onClick={toggleDropdown}>+ <div style={colorBlockStyle} />+ <Icon />+ </Button>+ </StyledDropdownButtonWrapper>+ <SingleColorPickerDropdown+ isOpened={isColorPickerOpened}+ onClose={closeDropdown}+ selectedColor={hexColor}+ onSelectColor={onSetColor}+ />+ </StyledConfigSection>+ );+};++export default CompactColorPicker;diff --git a/src/components/src/effects/effect-configurator.tsx b/src/components/src/effects/effect-configurator.tsxindex c7da242a9..3781f6951 100644--- a/src/components/src/effects/effect-configurator.tsx+++ b/src/components/src/effects/effect-configurator.tsx@@ -6,10 +6,10 @@ import {LIGHT_AND_SHADOW_EFFECT} from '@kepler.gl/constants';import {isNumber} from '@kepler.gl/utils';import {Effect, EffectUpdateProps} from '@kepler.gl/types';-import {PanelLabel} from '../common/styled-components';import RangeSliderFactory from '../common/range-slider';-import ColorSelectorFactory from '../side-panel/layer-panel/color-selector';+import {ArrowDownSmall} from '../common/icons';import EffectTimeConfiguratorFactory from './effect-time-configurator';+import CompactColorPicker from './compact-color-picker';export type EffectConfiguratorProps = {effect: Effect;@@ -24,7 +24,7 @@ const StyledEffectConfigurator = styled.div.attrs({className: 'effect-panel__config'})`position: relative;- margin-top: ${props => props.theme.effectConfiguratorMargin};+ margin: ${props => props.theme.effectConfiguratorMargin};padding: ${props => props.theme.effectConfiguratorPadding};`;@@ -33,6 +33,7 @@ export const PanelLabelWrapper = styled.div.attrs({})`display: flex;align-items: self-start;+ margin-bottom: 11px;.side-panel-panel__label {margin-top: 2px;@@ -47,6 +48,94 @@ export const StyledColorSelectorWrapper = styled.div`margin-top: 2px;`;+const StyledVerticalSeparator = styled.div`+ height: 1px;+ background-color: ${props => props.theme.inputBgd};+ margin-top: 20px;+ margin-bottom: 20px;+ margin-left: -20px;+`;++type StyledWrapperProps = {+ marginBottom?: number;+};+const StyledWrapper = styled.div<StyledWrapperProps>`+ display: flex;+ justify-content: space-between;+ align-items: center;+ margin-bottom: ${props => props.marginBottom ?? 9}px;+`;++const StyledConfigSection = styled.div`+ display: flex;+ flex-direction: column;+`;++const SectionTitle = styled.div`+ font-size: ${props => props.theme.inputFontSize};+ color: ${props => props.theme.effectPanelTextSecondary1};+ margin-bottom: 5px;+ text-transform: capitalize;+`;++const SectionSubTitle = styled.div`+ font-size: ${props => props.theme.inputFontSize};+ color: ${props => props.theme.effectPanelTextSecondary2};+ margin-bottom: 8px;+ margin-left: 6px;+`;++const StyleSliderWrapper = styled.div`+ align-self: flex-start;+ width: 199px;+ height: 32px;+ display: flex;+ align-items: center;+ .kg-range-slider__input {+ height: 32px;+ text-align: center;+ padding: 3px 6px;+ }+ .kg-slider {+ padding-left: 6px;+ }+ .kg-range-slider {+ padding: 0px !important;+ }+`;++const RegularOuterWrapper = styled.div.attrs({+ className: 'effect-configurator__pp-section'+})`+ margin-bottom: 8px;+`;++const RegularSectionTitleWrapper = styled.div.attrs({+ className: 'effect-configurator__pp-section-title'+})`+ font-size: ${props => props.theme.inputFontSize};+ color: ${props => props.theme.effectPanelTextSecondary1};+ text-transform: capitalize;+ margin-bottom: -3px;+`;++const RegularSliderWrapper = styled.div.attrs({+ className: 'effect-configurator__pp-section-control'+})`+ height: 32px;+ .kg-range-slider__input {+ height: 32px;+ text-align: center;+ padding: 3px 6px;+ }+ .kg-slider {+ padding-left: 6px;+ }+ .kg-range-slider {+ padding: 0px !important;+ }+`;+const COMMON_SLIDER_PROPS = {showInput: true,isRanged: false,@@ -54,15 +143,10 @@ const COMMON_SLIDER_PROPS = {label: 'value'};-EffectConfiguratorFactory.deps = [- RangeSliderFactory,- ColorSelectorFactory,- EffectTimeConfiguratorFactory-];+EffectConfiguratorFactory.deps = [RangeSliderFactory, EffectTimeConfiguratorFactory];export default function EffectConfiguratorFactory(RangeSlider: ReturnType<typeof RangeSliderFactory>,- ColorSelector: ReturnType<typeof ColorSelectorFactory>,EffectTimeConfigurator: ReturnType<typeof EffectTimeConfiguratorFactory>): React.FC<EffectConfiguratorProps> {const EffectConfigurator = ({@@ -79,7 +163,7 @@ export default function EffectConfiguratorFactory(value1: parameters[propName],range: [0, 1],value0: 0,- onChange: (value: number[], event?: Event) => {+ onChange: (value: number[], event?: Event | null) => {updateEffectConfig(event, effect.id, {parameters: {[propName]: value[1]}});}};@@ -119,7 +203,7 @@ export default function EffectConfiguratorFactory(return (<StyledEffectConfigurator key={effect.id}><PanelLabelWrapper>- <PanelLabel>{'Date & Time'}</PanelLabel>+ <SectionTitle>{'Date & Time'}</SectionTitle></PanelLabelWrapper><EffectTimeConfiguratortimestamp={parameters.timestamp}@@ -127,129 +211,150 @@ export default function EffectConfiguratorFactory(timeMode={parameters.timeMode}onTimeModeChange={onTimeModeChange}/>- <PanelLabelWrapper>- <PanelLabel>{'Shadow intensity'}</PanelLabel>- </PanelLabelWrapper>- <RangeSlider {...COMMON_SLIDER_PROPS} {...sliderProps[0]} />- <PanelLabelWrapper>- <PanelLabel>{'Shadow color'}</PanelLabel>- </PanelLabelWrapper>- <StyledColorSelectorWrapper>- <ColorSelector {...colorPickerProps[2]} />- </StyledColorSelectorWrapper>- <PanelLabelWrapper>- <PanelLabel>{'Ambient light intensity'}</PanelLabel>- </PanelLabelWrapper>- <RangeSlider {...COMMON_SLIDER_PROPS} {...sliderProps[1]} />- <PanelLabelWrapper>- <PanelLabel>{'Ambient light color'}</PanelLabel>- </PanelLabelWrapper>- <StyledColorSelectorWrapper>- <ColorSelector {...colorPickerProps[0]} />- </StyledColorSelectorWrapper>- <PanelLabelWrapper>- <PanelLabel>{'Sun light intensity'}</PanelLabel>- </PanelLabelWrapper>- <RangeSlider {...COMMON_SLIDER_PROPS} {...sliderProps[2]} />- <PanelLabelWrapper>- <PanelLabel>{'Sun light color'}</PanelLabel>- </PanelLabelWrapper>- <StyledColorSelectorWrapper>- <ColorSelector {...colorPickerProps[1]} />- </StyledColorSelectorWrapper>++ <StyledVerticalSeparator />++ <StyledWrapper marginBottom={0}>+ <SectionTitle>{'Shadow'}</SectionTitle>+ </StyledWrapper>+ <StyledWrapper marginBottom={16}>+ <CompactColorPicker+ label={'Color'}+ color={colorPickerProps[2].colorSets[0].selectedColor}+ onSetColor={colorPickerProps[2].colorSets[0].setColor}+ Icon={ArrowDownSmall}+ />+ <StyledConfigSection>+ <SectionSubTitle>Intensity</SectionSubTitle>+ <StyleSliderWrapper>+ <RangeSlider {...COMMON_SLIDER_PROPS} {...sliderProps[0]} />+ </StyleSliderWrapper>+ </StyledConfigSection>+ </StyledWrapper>++ <StyledWrapper marginBottom={0}>+ <SectionTitle>{'Ambient light'}</SectionTitle>+ </StyledWrapper>+ <StyledWrapper marginBottom={16}>+ <CompactColorPicker+ label={'Color'}+ color={colorPickerProps[0].colorSets[0].selectedColor}+ onSetColor={colorPickerProps[0].colorSets[0].setColor}+ Icon={ArrowDownSmall}+ />+ <StyledConfigSection>+ <SectionSubTitle>Intensity</SectionSubTitle>+ <StyleSliderWrapper>+ <RangeSlider {...COMMON_SLIDER_PROPS} {...sliderProps[1]} />+ </StyleSliderWrapper>+ </StyledConfigSection>+ </StyledWrapper>++ <StyledWrapper marginBottom={0}>+ <SectionTitle>{'Sun light'}</SectionTitle>+ </StyledWrapper>+ <StyledWrapper marginBottom={0}>+ <CompactColorPicker+ label={'Color'}+ color={colorPickerProps[1].colorSets[0].selectedColor}+ onSetColor={colorPickerProps[1].colorSets[0].setColor}+ Icon={ArrowDownSmall}+ />+ <StyledConfigSection>+ <SectionSubTitle>Intensity</SectionSubTitle>+ <StyleSliderWrapper>+ <RangeSlider {...COMMON_SLIDER_PROPS} {...sliderProps[2]} />+ </StyleSliderWrapper>+ </StyledConfigSection>+ </StyledWrapper></StyledEffectConfigurator>);}, [effect, effect.parameters, updateEffectConfig]);const renderPostProcessingEffectConfigurator = useCallback(() => {const uniforms = effect.deckEffect?.module.uniforms || {};- const propNames = useMemo(() => Object.keys(uniforms), [uniforms]);+ const parameterDescriptions = effect.getParameterDescriptions();- const slidersForProps = useMemo(() => {- return propNames.map(propName => {- const uniform = uniforms[propName];+ const controls = useMemo(() => {+ return parameterDescriptions.map(desc => {+ const paramName = desc.name;++ const uniform = uniforms[desc.name];if ((!uniform && uniform !== 0) || uniform.private) {return null;}- const sliders: {- value0: number;- value1: number;- range: [number, number];- onChange: (value: number[], e?: Event) => void;- }[] = [];- const prevValue = effect.parameters[propName];+ const prevValue = effect.parameters[paramName];- // the uniform is [0, 1] array- if (uniform.length === 2) {- sliders.push({- value1: prevValue[0] || 0,- range: [0, 1],- value0: 0,- onChange: (newValue, event) => {- updateEffectConfig(event, effect.id, {- parameters: {[propName]: [newValue[1], prevValue[1]]}- });- }- });+ const label = desc.label === false ? false : desc.label || desc.name;- sliders.push({- value1: prevValue[1] || 0,+ // the uniform is [number, number] array+ if (uniform.length === 2) {+ return {+ label,+ value1: prevValue[desc.index || 0] || 0,range: [0, 1],value0: 0,- onChange: (newValue, event) => {+ onChange: (newValue: number[], event) => {updateEffectConfig(event, effect.id, {- parameters: {[propName]: [prevValue[0], newValue[1]]}+ parameters: {+ [paramName]:+ desc.index === 0 ? [newValue[1], prevValue[1]] : [prevValue[0], newValue[1]]+ }});}- });+ };}// the uniform is a plain number without any descriptionelse if (isNumber(uniform)) {- sliders.push({- value1: prevValue || 0,- range: [0, 500],- value0: 0,- onChange: (newValue, event) => {- updateEffectConfig(event, effect.id, {parameters: {[propName]: newValue[1]}});+ return {+ label,+ value1: prevValue ?? 0,+ range: [desc.min ?? 0, desc.max ?? 500],+ value0: desc.min ?? 0,+ onChange: (newValue: number[], event) => {+ updateEffectConfig(event, effect.id, {parameters: {[paramName]: newValue[1]}});}- });+ };}// the uniform description is {value: 0, min: 0, max: 1, ...}else if (isNumber(uniform.value)) {- sliders.push({+ return {+ label,value1: prevValue || 0,- range: [uniform.min ?? uniform.softMin ?? 0, uniform.max ?? uniform.softMax ?? 1],- value0: uniform.min ?? uniform.softMin ?? 0,- onChange: (newValue, event) => {- updateEffectConfig(event, effect.id, {parameters: {[propName]: newValue[1]}});+ range: [+ desc.min ?? uniform.min ?? uniform.softMin ?? 0,+ desc.max ?? uniform.max ?? uniform.softMax ?? 1+ ],+ value0: desc.min ?? uniform.min ?? uniform.softMin ?? 0,+ onChange: (newValue: number[], event) => {+ updateEffectConfig(event, effect.id, {parameters: {[paramName]: newValue[1]}});}- });- } else {- return null;+ };}- return sliders;+ // ignore everything else for now+ return null;});- }, [propNames, effect, effect.parameters, updateEffectConfig]);+ }, [parameterDescriptions, effect, effect.parameters, updateEffectConfig]);return (<StyledEffectConfigurator key={effect.id}>- {propNames.map((propName, uniformIndex) => {- const slidersForProp = slidersForProps[uniformIndex];- if (!slidersForProp) {+ {parameterDescriptions.map((desc, parameterIndex) => {+ const control = controls[parameterIndex];+ if (!control) {return null;}return (- <div key={`${effect.id}-${uniformIndex}`}>- <PanelLabelWrapper>- <PanelLabel>{propName}</PanelLabel>- </PanelLabelWrapper>- {slidersForProp.map((sliderProp, sliderIndex) => {- return <RangeSlider key={sliderIndex} {...COMMON_SLIDER_PROPS} {...sliderProp} />;- })}- </div>+ <RegularOuterWrapper key={`${effect.id}-${parameterIndex}`}>+ {control.label ? (+ <RegularSectionTitleWrapper>{control.label}</RegularSectionTitleWrapper>+ ) : null}+ <RegularSliderWrapper>+ <RangeSlider key={parameterIndex} {...COMMON_SLIDER_PROPS} {...control} />+ </RegularSliderWrapper>+ </RegularOuterWrapper>);})}</StyledEffectConfigurator>diff --git a/src/components/src/effects/effect-manager.tsx b/src/components/src/effects/effect-manager.tsxindex 683991d30..b6eecaec7 100644--- a/src/components/src/effects/effect-manager.tsx+++ b/src/components/src/effects/effect-manager.tsx@@ -1,4 +1,4 @@-import React, {useMemo} from 'react';+import React, {useMemo, useCallback} from 'react';import styled from 'styled-components';import {injectIntl, IntlShape} from 'react-intl';@@ -76,11 +76,18 @@ function EffectManagerFactory(return effect.type === LIGHT_AND_SHADOW_EFFECT.type;});- return hasShadow- ? EFFECT_DESCRIPTIONS.filter(desc => desc.type !== LIGHT_AND_SHADOW_EFFECT.type)- : EFFECT_DESCRIPTIONS;+ return EFFECT_DESCRIPTIONS.map(desc => {+ return {+ ...desc,+ disabled: Boolean(hasShadow && desc.type === LIGHT_AND_SHADOW_EFFECT.type)+ };+ });}, [effects]);+ const onAddEffect = useCallback(type => {+ visStateActions.addEffect({type});+ }, []);+return (<StyledEffectPanelContainer className="effect-manager"><StyledEffectPanel>@@ -89,7 +96,7 @@ function EffectManagerFactory(className="effect-manager-title"title={intl.formatMessage({id: 'effectManager.effects'})}>- <EffectTypeSelector options={effectOptions} onSelect={visStateActions.addEffect} />+ <EffectTypeSelector options={effectOptions} onSelect={onAddEffect} /></SidePanelTitle></StyledEffectPanelHeader>diff --git a/src/components/src/effects/effect-panel-header.tsx b/src/components/src/effects/effect-panel-header.tsxindex d3d159390..1035f45d6 100644--- a/src/components/src/effects/effect-panel-header.tsx+++ b/src/components/src/effects/effect-panel-header.tsx@@ -2,10 +2,37 @@ import React, {useMemo} from 'react';import classnames from 'classnames';import styled from 'styled-components';-import {EFFECT_DESCRIPTIONS} from '@kepler.gl/constants';+import {+ EFFECT_DESCRIPTIONS,+ LIGHT_AND_SHADOW_EFFECT,+ POSTPROCESSING_EFFECTS+} from '@kepler.gl/constants';import PanelHeaderActionFactory from '../side-panel/panel-header-action';-import {ArrowDown, EyeSeen, EyeUnseen, Trash, VertDots, BaseProps} from '../common/icons';+import {+ ArrowDown,+ EyeSeen,+ EyeUnseen,+ Trash,+ VertDots,+ LightAndShadowEffectIcon,+ InkEffectIcon,+ BrightnessContrastEffectIcon,+ HueSaturationEffectIcon,+ VibranceEffectIcon,+ SepiaEffectIcon,+ DotScreenEffectIcon,+ ColorHalftoneEffectIcon,+ NoiseEffectIcon,+ TriangleBlurEffectIcon,+ ZoomBlurEffectIcon,+ TiltShiftEffectIcon,+ EdgeWorkEffectIcon,+ VignetteEffectIcon,+ MagnifyEffectIcon,+ HexagonalPixelateEffectIcon,+ BaseProps+} from '../common/icons';import {StyledPanelHeader} from '../common/styled-components';export type EffectPanelHeaderProps = {@@ -38,15 +65,39 @@ const defaultActionIcons = {enableConfig: ArrowDown};+const defaultEffectIcons = {+ [LIGHT_AND_SHADOW_EFFECT.type]: LightAndShadowEffectIcon,+ [POSTPROCESSING_EFFECTS.ink.type]: InkEffectIcon,+ [POSTPROCESSING_EFFECTS.brightnessContrast.type]: BrightnessContrastEffectIcon,+ [POSTPROCESSING_EFFECTS.hueSaturation.type]: HueSaturationEffectIcon,+ [POSTPROCESSING_EFFECTS.vibrance.type]: VibranceEffectIcon,+ [POSTPROCESSING_EFFECTS.sepia.type]: SepiaEffectIcon,+ [POSTPROCESSING_EFFECTS.dotScreen.type]: DotScreenEffectIcon,+ [POSTPROCESSING_EFFECTS.colorHalftone.type]: ColorHalftoneEffectIcon,+ [POSTPROCESSING_EFFECTS.noise.type]: NoiseEffectIcon,+ [POSTPROCESSING_EFFECTS.triangleBlur.type]: TriangleBlurEffectIcon,+ [POSTPROCESSING_EFFECTS.zoomBlur.type]: ZoomBlurEffectIcon,+ [POSTPROCESSING_EFFECTS.tiltShift.type]: TiltShiftEffectIcon,+ [POSTPROCESSING_EFFECTS.edgeWork.type]: EdgeWorkEffectIcon,+ [POSTPROCESSING_EFFECTS.vignette.type]: VignetteEffectIcon,+ [POSTPROCESSING_EFFECTS.magnify.type]: MagnifyEffectIcon,+ [POSTPROCESSING_EFFECTS.hexagonalPixelate.type]: HexagonalPixelateEffectIcon+};+const StyledEffectPanelHeader = styled(StyledPanelHeader)`height: ${props => props.theme.effectPanelHeaderHeight}px;position: relative;align-items: stretch;+ .effect__drag-handle {+ margin-left: -5px;+ color: ${props => props.theme.textColor};+ }+.effect__drag-handle__placeholder {height: 20px;padding: 0px;- margin: 10px;+ margin: 10px 10px 10px 5px;}:hover {@@ -162,7 +213,7 @@ export function EffectPanelHeaderActionSectionFactory(}const StyledEffectTitleSection = styled.div`- margin-left: 4px;+ margin-left: 8px;flex-grow: 1;align-items: center;display: flex;@@ -174,6 +225,12 @@ const IconPlaceholder = styled.div`height: 20px;`;+const EffectIconWrapper = styled.div`+ height: 18px;+ margin: auto;+ color: ${props => props.theme.textColor};+`;+EffectPanelHeaderFactory.deps = [EffectPanelHeaderActionSectionFactory];function EffectPanelHeaderFactory(@@ -194,6 +251,8 @@ function EffectPanelHeaderFactory(return description?.name || 'Effect';}, [type]);+ const EffectIcon = defaultEffectIcons[type];+return (<StyledEffectPanelHeaderclassName={classnames('effect-panel__header', {@@ -210,6 +269,8 @@ function EffectPanelHeaderFactory(<div className="effect__drag-handle__placeholder" />)}+ <EffectIconWrapper>{EffectIcon ? <EffectIcon height="18px" /> : null}</EffectIconWrapper>+<StyledEffectTitleSection>{label}</StyledEffectTitleSection><EffectPanelHeaderActionSection {...props} />diff --git a/src/components/src/effects/effect-time-configurator.tsx b/src/components/src/effects/effect-time-configurator.tsxindex 8c682cc10..7bfb3ffba 100644--- a/src/components/src/effects/effect-time-configurator.tsx+++ b/src/components/src/effects/effect-time-configurator.tsx@@ -13,7 +13,7 @@ import {StyledTimePicker, StyledDatePicker, Tooltip} from '../common/styled-compimport RangeSliderFactory from '../common/range-slider';import Checkbox from '../common/checkbox';import Button from '../common/data-table/button';-import {Pin} from '../common/icons';+import {LocationMarker, Calendar, Clock} from '../common/icons';const DAY_SLIDER_RANGE = 1000 * 60 * 60 * 24;@@ -24,35 +24,44 @@ export type EffectTimeConfiguratorProps = {onTimeModeChange: (newMode: LightAndShadowEffectTimeMode) => void;};-type StyledWrapperProps = {disabled?: boolean};+type StyledWrapperProps = {disabled?: boolean; marginBottom?: number};const StyledWrapper = styled.div<StyledWrapperProps>`display: flex;justify-content: space-between;align-items: center;- padding-left: 5px;- padding-right: 5px;- margin-bottom: 9px;- opacity: ${props => (props.disabled ? 0.3 : 1)};- ${props => (props.disabled ? 'pointer-events: none;' : '')}+ margin-bottom: ${props => props.marginBottom ?? 9}px;+ ${props => (props.hidden ? 'display: none;' : '')}`;type SliderWrapperProps = {disabled?: boolean};const SliderWrapper = styled.div<SliderWrapperProps>`margin-top: 13px;- margin-right: 8px;margin-bottom: 17px;+ ${props => (props.hidden ? 'display: none;' : '')}- opacity: ${props => (props.disabled ? 0.3 : 1)};- ${props => (props.disabled ? 'pointer-events: none;' : '')}+ .kg-range-slider__input {+ height: 32px;+ text-align: center;+ padding: 3px 6px;+ }+ .kg-slider {+ padding-left: 6px;+ }+ .kg-range-slider {+ padding: 0px !important;+ }`;const StyledButton = styled(Button)`- color: ${props => props.theme.textColor};+ color: ${props => props.theme.effectPanelTextSecondary2};background-color: ${props => props.theme.inputBgd};- height: 31px;+ height: 32px;+ width: 32px;padding: 5px;- border-radius: 2px;+ border-radius: 4px;+ justify-content: center;:hover {+ color: ${props => props.theme.effectPanelTextMain};background-color: ${props => props.theme.inputBgdHover};}`;@@ -63,20 +72,43 @@ const StyledRadio = styled(Checkbox)`font-size: ${props => props.theme.inputFontSize};}.kg-checkbox__label:before {- background-color: ${props => props.theme.inputBgdHover};+ background: transparent;+ border-color: ${props => props.theme.effectPanelTextSecondary2};+ }+ input:checked + .kg-checkbox__label:before {+ border-color: ${props => props.theme.activeColor};+ }+ .kg-checkbox__label:after {+ background-color: ${props => props.theme.activeColor};}-`;--const StyledLabelWrapper = styled.div`- color: ${props => props.theme.textColor};- margin-right: 10px;`;const StyledEffectTimeConfigurator = styled.div`- border-left: 3px solid ${props => props.theme.panelBorderColor};margin-bottom: 8px;margin-top: 3px;- margin-left: 3px;+`;++const WithIconWrapper = styled.div`+ position: relative;+`;++const StyledExtraIcon = styled.div`+ position: absolute;+ top: 0px;+ left: 8px;+ width: 0px;+ height: 32px;+ color: ${props => props.theme.effectPanelTextSecondary2};+ pointer-events: none;+`;++type TextBlockProps = {+ width: string;+};+const TextBlock = styled.div<TextBlockProps>`+ color: ${props => props.theme.effectPanelTextSecondary2};+ width: ${props => props.width};+ font-size: ${props => props.theme.inputFontSize};`;EffectTimeConfiguratorFactory.deps = [RangeSliderFactory];@@ -145,11 +177,15 @@ export default function EffectTimeConfiguratorFactory(onDateTimeChange(new Date().valueOf());}, [onDateTimeChange]);+ const formatShortWeekday = useCallback((locale, date) => {+ return ['S', 'M', 'T', 'W', 'T', 'F', 'S'][date.getDay()];+ }, []);+const disableDateTimePick = timeMode !== LIGHT_AND_SHADOW_EFFECT_TIME_MODES.pick;return (<StyledEffectTimeConfigurator>- <StyledWrapper>+ <StyledWrapper marginBottom={16}><StyledRadiotype="radio"checked={timeMode === LIGHT_AND_SHADOW_EFFECT_TIME_MODES.pick}@@ -162,30 +198,53 @@ export default function EffectTimeConfiguratorFactory(}}/></StyledWrapper>- <StyledWrapper disabled={disableDateTimePick}>++ <SliderWrapper hidden={disableDateTimePick}>+ <RangeSlider {...timeSliderProps} />+ </SliderWrapper>++ <StyledWrapper hidden={disableDateTimePick} marginBottom={2}>+ <TextBlock width="32px"></TextBlock>+ <TextBlock width="110px">+ <FormattedMessage id={'effectManager.date'} />+ </TextBlock>+ <TextBlock width="110px">+ <FormattedMessage id={'effectManager.time'} />+ </TextBlock>+ </StyledWrapper>++ <StyledWrapper hidden={disableDateTimePick} marginBottom={24}><StyledButton onClick={setCurrentDateTime} data-for="pick-time-button" data-tip>- <Pin height="15px" />+ <LocationMarker height="16px" /><Tooltip id="pick-time-button" effect="solid" place="top" delayShow={500}><FormattedMessage id={'effectManager.pickCurrrentTime'} /></Tooltip></StyledButton>- <StyledDatePicker value={dateOnly} onChange={setDate} />- <StyledTimePicker- value={selectedTimeString}- onChange={setTime}- disableClock={true}- format={'hh:mm a'}- />- <StyledLabelWrapper>- <FormattedMessage id={'UTC'} />- </StyledLabelWrapper>+ <WithIconWrapper>+ <StyledDatePicker+ value={dateOnly}+ onChange={setDate}+ minDetail={'month'}+ formatShortWeekday={formatShortWeekday}+ />+ <StyledExtraIcon>+ <Calendar width="16px" height="32px" />+ </StyledExtraIcon>+ </WithIconWrapper>+ <WithIconWrapper>+ <StyledTimePicker+ value={selectedTimeString}+ onChange={setTime}+ disableClock={true}+ format={'hh:mm a'}+ />+ <StyledExtraIcon>+ <Clock width="16px" height="32px" />+ </StyledExtraIcon>+ </WithIconWrapper></StyledWrapper>- <SliderWrapper disabled={disableDateTimePick}>- <RangeSlider {...timeSliderProps} />- </SliderWrapper>-- <StyledWrapper>+ <StyledWrapper marginBottom={16}><StyledRadiotype="radio"checked={timeMode === LIGHT_AND_SHADOW_EFFECT_TIME_MODES.current}@@ -199,7 +258,7 @@ export default function EffectTimeConfiguratorFactory(/></StyledWrapper>- <StyledWrapper>+ <StyledWrapper marginBottom={16}><StyledRadiotype="radio"checked={timeMode === LIGHT_AND_SHADOW_EFFECT_TIME_MODES.animation}diff --git a/src/components/src/effects/effect-type-dropdown-list.tsx b/src/components/src/effects/effect-type-dropdown-list.tsxnew file mode 100644index 000000000..1d2fd44f7--- /dev/null+++ b/src/components/src/effects/effect-type-dropdown-list.tsx@@ -0,0 +1,89 @@+import React, {useCallback} from 'react';+import styled from 'styled-components';+import classNames from 'classnames';++import {classList} from '../common/item-selector/dropdown-list';++export type EffectTypeDropdownListItem = {+ type: string;+ name: string;+ disabled: boolean;+};++export type EffectTypeDropdownListProps = {+ onOptionSelected: (string) => void;+ options: EffectTypeDropdownListItem[];+ selectedItems: EffectTypeDropdownListItem[];+ selectionIndex: number;+ customListItemComponent: React.FC<{value: EffectTypeDropdownListItem; isTile?: boolean}>;+};++const DropdownListWrapper = styled.div`+ ${props => props.theme.dropdownList};+ background-color: ${props => props.theme.dropdownListBgd};+ display: flex;+ flex-wrap: wrap;+ align-items: stretch;+ padding: 17px 0 12px 0;+ max-height: 430px;+ justify-content: center;+`;++const StyledDropdownListItem = styled.div`+ margin: 0px 4px 8px 4px;++ &.disabled {+ pointer-events: none;+ opacity: 0.3;+ }++ :hover {+ cursor: pointer;+ .effect-type-selector__item__label {+ color: ${props => props.theme.effectPanelTextMain};+ }+ }+`;++export function EffectTypeDropdownListFactory() {+ const EffectTypeDropdownList: React.FC<EffectTypeDropdownListProps> = ({+ onOptionSelected,+ options,+ selectedItems,+ selectionIndex,+ customListItemComponent+ }: EffectTypeDropdownListProps) => {+ const onSelectOption = useCallback(+ (e, value) => {+ e.preventDefault();+ onOptionSelected(value);+ },+ [onOptionSelected]+ );++ const ListItemComponent = customListItemComponent;++ return (+ <DropdownListWrapper className={classList.list}>+ {options.map((value, i) => (+ <StyledDropdownListItem+ className={classNames('effect-type-selector__item', {+ selected: selectedItems.find(it => it.type === value.type),+ hover: selectionIndex === i,+ disabled: value.disabled+ })}+ key={`${value.type}_${i}`}+ onMouseDown={e => onSelectOption(e, value)}+ onClick={e => onSelectOption(e, value)}+ >+ <ListItemComponent value={value} isTile />+ </StyledDropdownListItem>+ ))}+ </DropdownListWrapper>+ );+ };++ return EffectTypeDropdownList;+}++export default EffectTypeDropdownListFactory;diff --git a/src/components/src/effects/effect-type-list-item.tsx b/src/components/src/effects/effect-type-list-item.tsxnew file mode 100644index 000000000..7a71e85d5--- /dev/null+++ b/src/components/src/effects/effect-type-list-item.tsx@@ -0,0 +1,113 @@+import React from 'react';+import styled, {withTheme} from 'styled-components';+import classNames from 'classnames';++import {KEPLER_UNFOLDED_BUCKET} from '@kepler.gl/constants';+import {FormattedMessage} from '@kepler.gl/localization';++import {Add} from '../common/icons';++export const DUMMY_ITEM_ID: string = 'dummy';++export type EffectTypeListItemProps = {+ value: {type: string; name: string};+ className?: string;+ isTile?: boolean;+ theme: any;+};++const StyledListItem = styled.div`+ border-radius: 2px;+ height: 89px;+ transition: background-color 0.4s;++ :hover {+ background-color: ${props => props.theme.effectTypeIconBgHoverColor};+ }++ .effect-type-selector__item__icon {+ display: flex;+ background-image: url(${`${KEPLER_UNFOLDED_BUCKET}/images/kepler.gl-layer-icon-bg.png`});+ background-size: ${props => props.theme.effectTypeIconSizeL}px+ ${props => props.theme.effectTypeIconSizeL}px;+ height: ${props => props.theme.effectTypeIconSizeL}px;+ width: ${props => props.theme.effectTypeIconSizeL}px;+ border-radius: 2px;++ .effect-preview {+ height: ${props => props.theme.effectTypeIconSizeL}px;+ width: ${props => props.theme.effectTypeIconSizeL}px;+ }+ }++ .effect-type-selector__item__label {+ text-transform: capitalize;+ font-size: 10px;+ text-align: center;+ color: ${props => props.theme.effectPanelTextMain};+ max-width: ${props => props.theme.effectTypeIconSizeL}px;+ line-height: 14px;+ padding-top: 2px;+ }+`;++const StyledAddButton = styled(Add)`+ margin-right: 8px;+ height: 16px;+`;++const StyledPlaceholderButton = styled.div`+ align-items: center;+ display: flex;+ justify-content: space-between;+ margin-left: 3px;+ margin-right: 3px;+ letter-spacing: 0.3px;+ font-family: ${props => props.theme.effectPanelAddEffectFontFamily};+ font-weight: 500;+`;++/**+ * Transforms an effect type from camel case into a name of the image in kebab case.+ * @param {string} type+ * @returns {string}+ */+const getImageUrl = type => {+ const kebab = type.replace(+ /[A-Z]+(?![a-z])|[A-Z]/g,+ ($, ofs) => (ofs ? '-' : '') + $.toLowerCase()+ );+ return `${KEPLER_UNFOLDED_BUCKET}/images/effects/${kebab}.png`;+};++export function EffectTypeListItemFactory() {+ const EffectTypeListItem: React.FC<EffectTypeListItemProps> = ({value, isTile, className}) => {+ if (value?.type === DUMMY_ITEM_ID) {+ return (+ <StyledPlaceholderButton>+ <StyledAddButton />+ <FormattedMessage id={'effectManager.addEffect'} />+ </StyledPlaceholderButton>+ );+ }++ return (+ <StyledListItem+ className={classNames('effect-type-selector__item__inner', className, {+ list: !isTile+ })}+ >+ <div className="effect-type-selector__item__icon">+ <img className="effect-preview" src={getImageUrl(value.type)} />+ </div>+ <div className="effect-type-selector__item__label">+ <FormattedMessage id={`effect.type.${value.type}`} defaultMessage={value.name} />+ </div>+ </StyledListItem>+ );+ };++ return withTheme(EffectTypeListItem);+}++export default EffectTypeListItemFactory;diff --git a/src/components/src/effects/effect-type-selector.tsx b/src/components/src/effects/effect-type-selector.tsxindex dc6a40a3a..98f5c6eb1 100644--- a/src/components/src/effects/effect-type-selector.tsx+++ b/src/components/src/effects/effect-type-selector.tsx@@ -1,91 +1,86 @@-import React, {useRef, useCallback} from 'react';-import styled from 'styled-components';+import React, {useMemo} from 'react';+import styled, {withTheme} from 'styled-components';-import {FormattedMessage} from '@kepler.gl/localization';-import {addEffect} from '@kepler.gl/actions';--import {Button} from '../common/styled-components';-import {Add} from '../common/icons';-import TippyTooltip from '../common/tippy-tooltip';+import ItemSelector from '../common/item-selector/item-selector';+import EffectTypeDropdownListFactory from './effect-type-dropdown-list';+import EffectTypeListItemFactory, {DUMMY_ITEM_ID} from './effect-type-list-item';export type EffectTypeSelectorProps = {- options: {type: string; name: string}[];- onSelect: typeof addEffect;+ options: {type: string; name: string; disabled: boolean}[];+ onSelect: (type: any) => void;+ theme: any;};-const StyledTippyTooltipContentContainer = styled.div`- background-color: ${props => props.theme.panelBackgroundHover};- display: flex;- flex-direction: column;- align-items: start;- margin: -7px -18px; /* compensate for kepler tippy parent padding */- border-radius: 2px;- .button {- width: 100%;- justify-content: start;- color: ${props => props.theme.WHITE};+const DropdownWrapper = styled.div`+ border: 0;+ width: 100%;+ left: 0;+ z-index: ${props => props.theme.dropdownWrapperZ};+ width: 297px;+ margin-left: -194px;+ margin-top: 26px;+ .typeahead__input_icon {+ top: 41px;+ }+`;++const StyledLayerTypeSelector = styled.div`+ .item-selector .item-selector__dropdown {+ padding: 4px 10px 4px 10px;+ background-color: ${props => props.theme.secondaryBtnBgd};+ border-radius: ${props => props.theme.primaryBtnRadius};+ font-size: ${props => props.theme.primaryBtnFontSizeDefault};+ border: none;+ :hover {+ background-color: ${props => props.theme.secondaryBtnBgdHover};+ }+ .item-selector__dropdown__value {+ color: ${props => props.theme.secondaryBtnActColor};+ }}`;-/** @type [number, number] */-const TIPPY_DURATION: [number, number] = [300, 0];-/** @type [number, number] */-const TIPPY_OFFSET: [number, number] = [0, 4];+const getDisplayOption = op => op.name;+const getOptionValue = op => op.type;-function EffectTypeSelectorFactory(): React.FC<EffectTypeSelectorProps> {- const EffectTypeSelector = ({onSelect, options}: EffectTypeSelectorProps) => {- /** @type any */- const tippyInstance = useRef(null);+EffectTypeSelectorFactory.deps = [EffectTypeListItemFactory, EffectTypeDropdownListFactory];- const render = useCallback(- () => (- <StyledTippyTooltipContentContainer>- {options.map((effectDesc, idx) => {- return (- <Button- key={`${effectDesc.type}-${idx}`}- onClick={() => {- onSelect({type: effectDesc.type});- // @ts-expect-error type current- tippyInstance.current?.hide();- }}- secondary- >- {effectDesc.name}- </Button>- );- })}- </StyledTippyTooltipContentContainer>- ),- [options, tippyInstance, tippyInstance.current, onSelect]- );+function EffectTypeSelectorFactory(EffectTypeListItem, EffectTypeDropdownList) {+ const LayerTypeSelector: React.FC<EffectTypeSelectorProps> = ({+ options,+ onSelect+ }: EffectTypeSelectorProps) => {+ // Make sure effect type selector has dummy as selection+ const selectedItems = useMemo(() => {+ return [+ {+ type: DUMMY_ITEM_ID,+ name: DUMMY_ITEM_ID+ }+ ];+ }, []);return (- <TippyTooltip- placement="bottom-start"- offset={TIPPY_OFFSET}- duration={TIPPY_DURATION}- trigger="click"- interactive={true}- arrow={false}- hideOnClick={true}- onTrigger={instance => {- // @ts-expect-error type current- tippyInstance.current = instance;- }}- zIndex={999} // defaults to 9999; keep it below modals (1000)- render={render}- >- <div>- <Button className="add-effect-button" secondary>- <Add height="12px" />- <FormattedMessage id={'effectManager.addEffect'} />- </Button>- </div>- </TippyTooltip>+ <StyledLayerTypeSelector className="effect-config__type">+ <ItemSelector+ selectedItems={selectedItems}+ options={options}+ multiSelect={false}+ disabled={false}+ placeholder="effectManager.addEffect"+ onChange={onSelect}+ getOptionValue={getOptionValue}+ filterOption="name"+ displayOption={getDisplayOption}+ DropDownLineItemRenderComponent={EffectTypeListItem}+ DropDownRenderComponent={EffectTypeDropdownList}+ DropDownWrapperComponent={DropdownWrapper}+ />+ </StyledLayerTypeSelector>);};- return EffectTypeSelector;++ return withTheme(LayerTypeSelector);}export default EffectTypeSelectorFactory;diff --git a/src/components/src/map/effects/effect-control.tsx b/src/components/src/map/effects/effect-control.tsxindex 460dcd204..0eaa20307 100644--- a/src/components/src/map/effects/effect-control.tsx+++ b/src/components/src/map/effects/effect-control.tsx@@ -2,12 +2,12 @@ import React, {useCallback, ComponentType} from 'react';import {MapControls} from '@kepler.gl/types';-import {EyeSeen} from '../../common/icons';+import {MagicWand} from '../../common/icons';import {MapControlButton} from '../../common/styled-components';import MapControlTooltipFactory from '../map-control-tooltip';interface EffectControlIcons {- eyeSeen: ComponentType<any>;+ effectsIcon: ComponentType<any>;}export type EffectControlProps = {@@ -22,7 +22,7 @@ export default function EffectControlFactory(MapControlTooltip: ReturnType<typeof MapControlTooltipFactory>): React.FC<EffectControlProps> {const defaultActionIcons = {- eyeSeen: EyeSeen+ effectsIcon: MagicWand};const EffectControl = ({@@ -55,7 +55,7 @@ export default function EffectControlFactory(onClick={onClick}active={active}>- <actionIcons.eyeSeen height="22px" />+ <actionIcons.effectsIcon height="22px" /></MapControlButton></MapControlTooltip>);diff --git a/src/constants/src/default-settings.ts b/src/constants/src/default-settings.tsindex a18e15527..a382ed8f4 100644--- a/src/constants/src/default-settings.ts+++ b/src/constants/src/default-settings.ts@@ -30,7 +30,7 @@ import {scalePoint} from 'd3-scale';import {TOOLTIP_FORMAT_TYPES} from './tooltip';-import {RGBAColor} from '@kepler.gl/types';+import {RGBAColor, EffectDescription} from '@kepler.gl/types';export const ACTION_PREFIX = '@@kepler.gl/';export const KEPLER_UNFOLDED_BUCKET = 'https://studio-public-data.foursquare.com/statics/keplergl';@@ -1170,7 +1170,11 @@ export const DEFAULT_LIGHT_COLOR: [number, number, number] = [255, 255, 255];export const DEFAULT_LIGHT_INTENSITY = 1;export const DEFAULT_SHADOW_INTENSITY = 0.5;export const DEFAULT_SHADOW_COLOR: [number, number, number] = [0, 0, 0];-export const LIGHT_AND_SHADOW_EFFECT = {type: 'lightAndShadow', name: 'Light & Shadow'};+export const LIGHT_AND_SHADOW_EFFECT: EffectDescription = {+ type: 'lightAndShadow',+ name: 'Light & Shadow',+ parameters: []+};export const LIGHT_AND_SHADOW_EFFECT_TIME_MODES = {pick: 'pick' as 'pick',current: 'current' as 'current',@@ -1197,70 +1201,189 @@ export const DEFAULT_LIGHT_AND_SHADOW_PROPS: {ambientLightIntensity: DEFAULT_LIGHT_INTENSITY};-export const POSTPROCESSING_EFFECTS: {[key: string]: {type: string; name: string}} = {+export const POSTPROCESSING_EFFECTS: {[key: string]: EffectDescription} = {ink: {type: 'ink',- name: 'Ink'+ name: 'Ink',+ parameters: [{name: 'strength'}]},brightnessContrast: {type: 'brightnessContrast',- name: 'Brightness & Contrast'+ name: 'Brightness & Contrast',+ parameters: [{name: 'brightness'}, {name: 'contrast'}]},hueSaturation: {type: 'hueSaturation',- name: 'Hue & Saturation'+ name: 'Hue & Saturation',+ parameters: [{name: 'hue'}, {name: 'saturation'}]},vibrance: {type: 'vibrance',- name: 'Vibrance'+ name: 'Vibrance',+ parameters: [{name: 'amount'}]},sepia: {type: 'sepia',- name: 'Sepia'+ name: 'Sepia',+ parameters: [{name: 'amount'}]},dotScreen: {type: 'dotScreen',- name: 'Dot Screen'+ name: 'Dot Screen',+ parameters: [+ {+ name: 'angle'+ },+ {+ name: 'size'+ },+ {+ name: 'center',+ label: 'Center X',+ index: 0+ },+ {+ name: 'center',+ label: 'Center Y',+ index: 1+ }+ ]},colorHalftone: {type: 'colorHalftone',- name: 'Color Halftone'+ name: 'Color Halftone',+ parameters: [+ {+ name: 'angle'+ },+ {+ name: 'size'+ },+ {+ name: 'center',+ label: 'Center X',+ index: 0+ },+ {+ name: 'center',+ label: 'Center Y',+ index: 1+ }+ ]},noise: {type: 'noise',- name: 'Noise'+ name: 'Noise',+ parameters: [{name: 'amount'}]},triangleBlur: {type: 'triangleBlur',- name: 'Blur (Triangle)'+ name: 'Blur (Triangle)',+ parameters: [{name: 'radius'}, {name: 'delta'}]},zoomBlur: {type: 'zoomBlur',- name: 'Blur (Zoom)'+ name: 'Blur (Zoom)',+ parameters: [+ {+ name: 'strength'+ },+ {+ name: 'center',+ label: 'Center X',+ index: 0+ },+ {+ name: 'center',+ label: 'Center Y',+ index: 1+ }+ ]},tiltShift: {type: 'tiltShift',- name: 'Blur (Tilt Shift)'+ name: 'Blur (Tilt Shift)',+ parameters: [+ {+ name: 'blurRadius',+ label: 'Blur'+ },+ {+ name: 'gradientRadius',+ label: 'Gradient'+ },+ {+ name: 'start',+ index: 0+ },+ {+ name: 'start',+ label: false,+ index: 1+ },+ {+ name: 'end',+ index: 0+ },+ {+ name: 'end',+ label: false,+ index: 1+ }+ ]},edgeWork: {type: 'edgeWork',- name: 'Edge work'+ name: 'Edge work',+ parameters: [{name: 'radius'}, {name: 'delta'}]},vignette: {type: 'vignette',- name: 'Vignette'+ name: 'Vignette',+ parameters: [{name: 'amount'}, {name: 'radius'}]},magnify: {type: 'magnify',- name: 'Magnify'+ name: 'Magnify',+ parameters: [+ {+ name: 'screenXY',+ label: 'Position X',+ index: 0,+ default: 0.5+ },+ {+ name: 'screenXY',+ label: 'Position Y',+ index: 1,+ default: 0.5+ },+ {+ name: 'radiusPixels',+ label: 'Size',+ min: 10+ },+ {+ name: 'zoom',+ min: 0.5,+ max: 50+ },+ {+ name: 'borderWidthPixels',+ label: 'Border Width',+ default: 3,+ max: 100+ }+ ]},hexagonalPixelate: {type: 'hexagonalPixelate',- name: 'Hexagonal Pixelate'+ name: 'Hexagonal Pixelate',+ parameters: [{name: 'scale'}]}};-export const EFFECT_DESCRIPTIONS: {type: string; name: string}[] = [+export const EFFECT_DESCRIPTIONS: EffectDescription[] = [LIGHT_AND_SHADOW_EFFECT,...Object.keys(POSTPROCESSING_EFFECTS).map(keyName => POSTPROCESSING_EFFECTS[keyName])];diff --git a/src/effects/src/effect.ts b/src/effects/src/effect.tsindex 16e55b18c..46f594392 100644--- a/src/effects/src/effect.ts+++ b/src/effects/src/effect.ts@@ -1,6 +1,11 @@import {generateHashId} from '@kepler.gl/utils';-import {Effect as EffectInterface, EffectProps, EffectPropsPartial} from '@kepler.gl/types';-import {DEFAULT_POST_PROCESSING_EFFECT_TYPE} from '@kepler.gl/constants';+import {+ Effect as EffectInterface,+ EffectProps,+ EffectPropsPartial,+ EffectParameterDescription+} from '@kepler.gl/types';+import {DEFAULT_POST_PROCESSING_EFFECT_TYPE, POSTPROCESSING_EFFECTS} from '@kepler.gl/constants';export class Effect implements EffectInterface {id: string;@@ -10,6 +15,7 @@ export class Effect implements EffectInterface {// effect specific parameters for a deck.gl effect (uniforms)parameters: {[key: string]: any};deckEffect: any;+ _uiConfig: EffectParameterDescription[];constructor(props: EffectPropsPartial = {}) {this.id = props.id || `e_${generateHashId(6)}`;@@ -20,6 +26,8 @@ export class Effect implements EffectInterface {this.isConfigActive = _props.isConfigActive;this.parameters = _props.parameters;+ this._uiConfig = POSTPROCESSING_EFFECTS[this.type]?.parameters || [];+this.deckEffect = null;this._initializeEffect();}@@ -49,6 +57,14 @@ export class Effect implements EffectInterface {isValidToSave() {return Boolean(this.type && this.id && this.deckEffect);}++ /**+ * Effect specific list of configurable parameters.+ * @returns All parameters are in preffered order.+ */+ getParameterDescriptions() {+ return this._uiConfig || [];+ }}export default Effect;diff --git a/src/effects/src/post-processing-effect.ts b/src/effects/src/post-processing-effect.tsindex 22eb3900b..11a9f3fcf 100644--- a/src/effects/src/post-processing-effect.ts+++ b/src/effects/src/post-processing-effect.ts@@ -85,6 +85,17 @@ const POSTPROCESSING_EFFECTS_DESCS = [}];+/**+ * Temp. Get custom default values from effect description+ */+const getDefaultValueForParameter = (name, effectDescription) => {+ const rec = effectDescription.filter(param => param.name === name);+ if (rec.length === 1) return rec[0].default;+ else if (rec.length === 2 && rec[0].default !== undefined && rec[1].default !== undefined) {+ return [rec[0].default, rec[1].default];+ }+};+class PostProcessingEffect extends Effect {// deckEffect: PostProcessEffect | LightingEffect | null;@@ -103,9 +114,13 @@ class PostProcessingEffect extends Effect {const keys = Object.keys(uniforms);const defaultParameters = {};keys.forEach(key => {- defaultParameters[key] = uniforms[key].value ?? uniforms[key];+ defaultParameters[key] =+ getDefaultValueForParameter(key, this._uiConfig) ??+ uniforms[key].value ??+ uniforms[key];});this.parameters = {...defaultParameters, ...this.parameters};+ this.deckEffect?.setProps(this.parameters);}}}diff --git a/src/localization/src/translations/en.ts b/src/localization/src/translations/en.tsindex 927855e34..41bc69c24 100644--- a/src/localization/src/translations/en.ts+++ b/src/localization/src/translations/en.ts@@ -191,7 +191,9 @@ export default {addEffect: 'Add effect',pickDateTime: 'Pick date/time',currentTime: 'Current time',- pickCurrrentTime: 'Pick current time'+ pickCurrrentTime: 'Pick current time',+ date: 'Date',+ time: 'Time'},layerConfiguration: {defaultDescription: 'Calculate {property} based on selected field',diff --git a/src/styles/src/base.ts b/src/styles/src/base.tsindex dfd3752b7..293bca39d 100644--- a/src/styles/src/base.ts+++ b/src/styles/src/base.ts@@ -358,12 +358,6 @@ export const sliderMarginTopIsTime = -12;export const sliderMarginTop = 12;export const sliderMarginBottom = 12;-// Date picker-export const datePickerFontSize = '11px';-export const datePickerBgdColor = inputBgd;-export const datePickerBgdHover = inputBgdHover;-export const datePickerSelectedDateBgColor = primaryBtnBgd;-// Geocoderexport const geocoderWidth = 360;export const geocoderTop = 20;@@ -478,9 +472,27 @@ export const breakPoints = {desk: 768};-// effectConfigurator-export const effectConfiguratorMargin = '6px';-export const effectConfiguratorPadding = '8px 0px 8px 5px';+// effect manager+export const effectConfiguratorMargin = '18px 0 18px 0';+export const effectConfiguratorPadding = '0 0 0 18px';+export const effectPanelWidth = 345;+export const effectPanelHeight = 180;+export const effectPanelPaddingSide = 16;+export const effectPanelPaddingTop = 16;+export const effectPanelAddEffectFontFamily = btnFontFamily;++export const effectTypeIconMarginSide = 6;+export const effectTypeIconSizeL = 56;++export const effectTypeIconBgHoverColor = '#262D40';+export const effectPanelTextMain = '#F7F7F7';+export const effectPanelTextSecondary1 = '#A0A7B4';+export const effectPanelTextSecondary2 = '#6A7485';+export const effectPanelTextSecondary3 = '#5A6475';++// right panel+export const rightPanelMarginTop = 12;+export const rightPanelMarginRight = 12;// theme is passed to kepler.gl when it's mounted,// it is used by styled-components to pass along to@@ -1460,12 +1472,6 @@ export const theme = {sliderMarginTop,sliderMarginBottom,- // Date picker- datePickerFontSize,- datePickerBgdColor,- datePickerBgdHover,- datePickerSelectedDateBgColor,-// GeocodergeocoderWidth,geocoderTop,@@ -1557,22 +1563,32 @@ export const theme = {layerConfiguratorMargin,layerConfiguratorPadding,- // effectConfigurator- effectConfiguratorMargin,- effectConfiguratorPadding,-// Styled tokenfieldTokenRightMargin,fieldTokenHeight,fieldTokenWidth,- // Effects- effectPanelWidth: 345,- effectPanelHeight: 180,- effectPanelPaddingSide: 16,- effectPanelPaddingTop: 16,- rightPanelMarginTop: 12,- rightPanelMarginRight: 12+ // Effect panel+ effectPanelWidth,+ effectPanelHeight,+ effectPanelPaddingSide,+ effectPanelPaddingTop,+ rightPanelMarginTop,+ rightPanelMarginRight,+ effectPanelAddEffectFontFamily,++ // effect type selector+ effectTypeIconMarginSide,+ effectTypeIconSizeL,+ effectTypeIconBgHoverColor,++ // effectConfigurator+ effectConfiguratorMargin,+ effectConfiguratorPadding,+ effectPanelTextMain,+ effectPanelTextSecondary1,+ effectPanelTextSecondary2,+ effectPanelTextSecondary3};export const themeLT = {diff --git a/src/types/effects.d.ts b/src/types/effects.d.tsindex e57e3490c..397a13edd 100644--- a/src/types/effects.d.ts+++ b/src/types/effects.d.ts@@ -1,3 +1,18 @@+export type EffectParameterDescription = {+ name: string;+ label?: string | false;+ index?: number;+ min?: number;+ max?: number;+ default?: number;+};++export type EffectDescription = {+ type: string;+ name: string;+ parameters: EffectParameterDescription[];+};+export type EffectUpdateProps = {isEnabled: boolean;isConfigActive: boolean;@@ -20,8 +35,10 @@ export interface Effect {// effect specific parameters for a deck.gl effect (uniforms)parameters: {[key: string]: any};deckEffect: any;+ _uiConfig: EffectParameterDescription[];getDefaultProps(props: Partial<EffectProps>): EffectProps;setProps(props: Partial<EffectProps>): void;isValidToSave(): boolean;+ getParameterDescriptions(): EffectParameterDescription[];}diff --git a/test/browser/components/effects/effect-configurator-test.js b/test/browser/components/effects/effect-configurator-test.jsindex 4bad461a7..cedbe919b 100644--- a/test/browser/components/effects/effect-configurator-test.js+++ b/test/browser/components/effects/effect-configurator-test.js@@ -92,7 +92,7 @@ test('Components -> EffectConfigurator -> render -> light & shadow effect', t =>}, `EffectConfigurator for ${nextState.effects[0].type} should not fail`);t.equal(wrapper.find('RangeSlider').length, 4, `should render 4 RangeSliders`);- t.equal(wrapper.find('ColorSelector').length, 3, `should render 3 ColorSelectors`);+ t.equal(wrapper.find('CompactColorPicker').length, 3, `should render 3 CompactColorPickers`);t.equal(wrapper.find('EffectTimeConfigurator').length,1,diff --git a/test/node/schemas/vis-state-schema-test.js b/test/node/schemas/vis-state-schema-test.jsindex a63d50058..215792fe6 100644--- a/test/node/schemas/vis-state-schema-test.js+++ b/test/node/schemas/vis-state-schema-test.js@@ -365,10 +365,10 @@ test('#visStateSchema -> v1 -> save load effects', t => {type: 'magnify',isEnabled: true,parameters: {- screenXY: [0, 0],+ screenXY: [0.5, 0.5],radiusPixels: 200,zoom: 2,- borderWidthPixels: 0,+ borderWidthPixels: 3,borderColor: [255, 255, 255, 255]}},