playbook_ui 14.22.0.pre.alpha.testdialog8898 → 14.22.0.pre.rc.0

data/app/pb_kits/playbook/pb_circle_chart/docs/_circle_chart_legend_position.jsx

@@ -1,142 +1,114 @@
 import React from 'react'
-import circleChartTheme from '../circleChartTheme'
-import Highcharts from "highcharts"
-import HighchartsReact from "highcharts-react-official"
+
+import CircleChart from '../_circle_chart'
+
 import Title from '../../pb_title/_title'
 
-const dataFirst = [
+const data = [
   {
     name: 'Waiting for Calls',
-    y: 41,
+    value: 41,
   },
   {
     name: 'On Call',
-    y: 49,
+    value: 49,
   },
   {
     name: 'After Call',
-    y: 10,
+    value: 10,
   },
 ]
 
-const dataSecond = [{
+const dataFirst = [{
   name: 'Bugs',
-  y: 8,
+  value: 8,
+
 },
 {
   name: 'Chores',
-  y: 1,
+  value: 1,
+
 },
 {
   name: 'Stories',
-  y: 12,
-}]
+  value: 12,
+},
+]
 
-const dataThird = [
+const dataSecond = [
   {
     name: 'Queued',
-    y: 7,
+    value: 7,
   },
   {
     name: 'In Progress',
-    y: 6,
+    value: 6,
   },
   {
     name: 'Validation',
-    y: 3,
+    value: 3,
   },
   {
     name: 'Done',
-    y: 6,
+    value: 6,
   },
 ]
 
-const CircleChartLegendPosition = (props) => {
-  const chartOptionsFirst = {
-    title: { text: "Alignment of Legend" },
-    series: [{ data: dataFirst }],
-    legend: {
-      align: 'right',
-      verticalAlign: 'top'
-    },
-    plotOptions: {
-      pie: {
-        showInLegend: true
-      }
-    }
-  }
-
-  const chartOptionsSecond = {
-    title: { text: "Layout of Legend" },
-    series: [{ data: dataSecond }],
-    legend: {
-      layout: 'vertical'
-    },
-    plotOptions: {
-      pie: {
-        showInLegend: true
-      }
-    }
-  }
-
-  const chartOptionsThird = {
-    title: { text: "Offset of Legend" },
-    series: [{ data: dataThird }],
-    legend: {
-      layout: 'vertical',
-      x: 100,
-      y: 10
-    },
-    plotOptions: {
-      pie: {
-        showInLegend: true
-      }
-    }
-  }
-
-  const optionsFirst = Highcharts.merge({}, circleChartTheme, chartOptionsFirst)
-  const optionsSecond = Highcharts.merge({}, circleChartTheme, chartOptionsSecond)
-  const optionsThird = Highcharts.merge({}, circleChartTheme, chartOptionsThird)
 
-  return (
-    <div>
-      <Title
-          paddingY="sm"
-          size={4}
-          tag="h4"
-          text="align | verticalAlign"
-          {...props}
-      />
-      <HighchartsReact
-          highcharts={Highcharts}
-          options={optionsFirst}
-      />
-      
-      <Title
-          paddingY="sm"
-          size={4}
-          tag="h4"
-          text="layout"
-          {...props}
-      />
-      <HighchartsReact
-          highcharts={Highcharts}
-          options={optionsSecond}
-      />
-      
-      <Title
-          paddingY="sm"
-          size={4}
-          tag="h4"
-          text="x | y"
-          {...props}
-      />
-      <HighchartsReact
-          highcharts={Highcharts}
-          options={optionsThird}
-      />
-    </div>
-  )
-}
+const CircleChartLegendPosition = (props) => (
+  <div>
+    <Title
+        paddingBottom="sm"
+        paddingTop="sm"
+        size={4}
+        tag="h4"
+        text="align | verticalAlign"
+    />
+    <CircleChart
+        align='right'
+        chartData={data}
+        id="legend-position-circle"
+        legend
+        paddingBottom="sm"
+        title="Alignment of Legend"
+        verticalAlign="top"
+        {...props}
+    />
+    <Title
+        paddingBottom="sm"
+        paddingTop="sm"
+        size={4}
+        tag="h4"
+        text="layout"
+    />
+    <CircleChart
+        chartData={dataFirst}
+        id="legend-position-circle-1"
+        layout="vertical"
+        legend
+        paddingBottom="sm"
+        paddingTop="sm"
+        title="Layout of Legend"
+        {...props}
+    />
+    <Title
+        paddingBottom="sm"
+        paddingTop="sm"
+        size={4}
+        tag="h4"
+        text="x | y"
+    />
+    <CircleChart
+        chartData={dataSecond}
+        id="legend-position-circle-2"
+        layout="vertical"
+        legend
+        title="Offset of Legend"
+        x={100}
+        y={10}
+        {...props}
+    />
+  </div>
+)
 
 export default CircleChartLegendPosition

data/app/pb_kits/playbook/pb_circle_chart/docs/_circle_chart_legend_position.md

@@ -6,9 +6,12 @@
 `x` **Type**: Number (defaults to 0)
 `y` **Type**: Number (defaults to 0)
 
-`layout` determines the position of the legend items
+- 
+
+- `layout` determines the position of the legend items
 `layout: proximate` will place the legend items as close as possible to the graphs they're representing. It will also determine whether to place the legend above/below or on the side of the plot area, if the legend is in a corner.
 
-`x` offsets the legend relative to its horizontal alignment. Negative x moves it to the left, positive x moves it to the right
+- `x` offsets the legend relative to its horizontal alignmnet. Negative x moves it to the left, positive x moves it to the right
+
 
-`y` offsets the legend relative to its vertical alignment. Negative y moves it up, positive y moves it down.
+- `y` offsets the legend relative to its vertical alignmnet. Negative y moves it up, positive y moves it down.

data/app/pb_kits/playbook/pb_circle_chart/docs/_circle_chart_live_data.jsx

@@ -1,37 +1,36 @@
 import React, { useState } from 'react'
-import circleChartTheme from '../circleChartTheme'
-import Highcharts from "highcharts"
-import HighchartsReact from "highcharts-react-official"
+
+import CircleChart from '../_circle_chart'
 import Button from '../../pb_button/_button'
 
 const CircleChartLiveData = (props) => {
   const [data, setData] = useState([
     {
       name: 'Waiting for Calls',
-      y: 41,
+      value: 41,
     },
     {
       name: 'On Call',
-      y: 49,
+      value: 49,
     },
     {
       name: 'After Call',
-      y: 10,
+      value: 10,
     },
   ])
 
   const data2 = [
     {
       name: 'Waiting for Calls',
-      y: 48,
+      value: 48,
     },
     {
       name: 'On Call',
-      y: 12,
+      value: 12,
     },
     {
       name: 'After Call',
-      y: 140,
+      value: 140,
     },
   ]
 
@@ -39,12 +38,6 @@ const CircleChartLiveData = (props) => {
     setData(data2)
   }
 
-  const chartOptions = {
-    series: [{ data: data }],
-  }
-
-  const options = Highcharts.merge({}, circleChartTheme, chartOptions)
-
   return (
     <div>
       <Button
@@ -52,12 +45,13 @@ const CircleChartLiveData = (props) => {
           text="Update Value"
           {...props}
       />
-      <HighchartsReact
-          highcharts={Highcharts}
-          options={options}
+      <CircleChart
+          chartData={data}
+          id="circle-chart-live-data"
+          {...props}
       />
     </div>
   )
 }
 
-export default CircleChartLiveData
+export default CircleChartLiveData

data/app/pb_kits/playbook/pb_circle_chart/docs/_circle_chart_pb_styles.jsx

@@ -0,0 +1,38 @@
+import React from 'react'
+import circleChartTheme from '../circleChartTheme'
+import Highcharts from "highcharts"
+import HighchartsReact from "highcharts-react-official"
+
+const data = [
+  {
+    name: 'Waiting for Calls',
+    y: 41,
+  },
+  {
+    name: 'On Call',
+    y: 49,
+  },
+  {
+    name: 'After Call',
+    y: 10,
+  },
+]
+
+const baseOptions = {
+  series: [{ data: data }],
+}
+
+const CircleChartPbStyles = () => {
+  const options = Highcharts.merge({}, circleChartTheme, baseOptions )
+
+  return (
+    <div>
+      <HighchartsReact
+          highcharts={Highcharts}
+          options={options}
+      />
+    </div>
+  );
+};
+
+export default CircleChartPbStyles;

data/app/pb_kits/playbook/pb_circle_chart/docs/_circle_chart_pb_styles.md

@@ -0,0 +1 @@
+You don't need to use the Circle Chart Kit to apply Playbook styles to your Highcharts circle chart. Just import circleChartTheme.ts and merge it with your chart options—Playbook’s styling will apply automatically.

data/app/pb_kits/playbook/pb_circle_chart/docs/_circle_chart_rounded.jsx

@@ -1,45 +1,32 @@
 import React from 'react'
-import circleChartTheme from '../circleChartTheme'
-import Highcharts from "highcharts"
-import HighchartsReact from "highcharts-react-official"
+
+import CircleChart from '../_circle_chart'
 
 const dataRounded = [
   {
     name: 'Waiting for Calls',
-    y: 41,
+    value: 41,
   },
   {
     name: 'On Call',
-    y: 49,
+    value: 49,
   },
   {
     name: 'After Call',
-    y: 10,
+    value: 10,
   },
 ]
 
-const CircleChartRounded = () => {
-  const chartOptions = {
-    series: [{ data: dataRounded }],
-    plotOptions: {
-      pie: {
-        borderColor: null,
-        borderWidth: 20,
-        innerSize: '100%',
-      },
-    },
-  }
-
-  const options = Highcharts.merge({}, circleChartTheme, chartOptions)
-
-  return (
-    <div>
-      <HighchartsReact
-          highcharts={Highcharts}
-          options={options}
-      />
-    </div>
-  )
-}
+const CircleChartRounded = (props) => (
+  <div>
+    <CircleChart
+        chartData={dataRounded}
+        id="default-test-rounded"
+        innerSize="lg"
+        rounded
+        {...props}
+    />
+  </div>
+)
 
-export default CircleChartRounded
+export default CircleChartRounded

data/app/pb_kits/playbook/pb_circle_chart/docs/_circle_chart_with_labels.jsx

@@ -1,61 +1,47 @@
 import React from 'react'
-import circleChartTheme from '../circleChartTheme'
-import Highcharts from "highcharts"
-import HighchartsReact from "highcharts-react-official"
+
+import CircleChart from '../_circle_chart'
 
 const dataWithLabels = [
   {
     name: 'Facebook',
-    y: 2498,
+    value: 2498,
   },
   {
     name: 'YouTube',
-    y: 2000,
+    value: 2000,
   },
   {
     name: 'WhatsApp',
-    y: 2000,
+    value: 2000,
   },
   {
     name: 'Facebook Messenger',
-    y: 1300,
+    value: 1300,
   },
   {
     name: 'WeChat',
-    y: 1165,
+    value: 1165,
   },
   {
     name: 'Instagram',
-    y: 1000,
+    value: 1000,
   },
   {
     name: 'Tik Tok',
-    y: 800,
+    value: 800,
   },
 ]
 
-const CircleChartWithLabels = () => {
-  const chartOptions = {
-    series: [{ data: dataWithLabels }],
-    plotOptions: {
-      pie: {
-        dataLabels: {
-          enabled: true,
-        }
-      }
-    }
-  }
-
-  const options = Highcharts.merge({}, circleChartTheme, chartOptions)
-
-  return (
-    <div>
-      <HighchartsReact
-          highcharts={Highcharts}
-          options={options}
-      />
-    </div>
-  )
-}
+const CircleChartWithLabels = (props) => (
+  <div>
+    <CircleChart
+        chartData={dataWithLabels}
+        dataLabels
+        id="with-labels-example"
+        {...props}
+    />
+  </div>
+)
 
-export default CircleChartWithLabels
+export default CircleChartWithLabels

data/app/pb_kits/playbook/pb_circle_chart/docs/_circle_chart_with_legend_kit.jsx

@@ -1,41 +1,32 @@
 import React from 'react'
-import circleChartTheme from '../circleChartTheme'
-import Highcharts from "highcharts"
-import HighchartsReact from "highcharts-react-official"
+
+import CircleChart from '../_circle_chart'
 
 const dataWithLegend = [{
   name: 'Bugs',
-  y: 8,
+  value: 8,
+
 },
 {
   name: 'Chores',
-  y: 1,
+  value: 1,
+
 },
 {
   name: 'Stories',
-  y: 12,
-}]
-
-const CircleChartWithLegendKit = () => {
-  const chartOptions = {
-    series: [{ data: dataWithLegend }],
-    plotOptions: {
-      pie: {
-        showInLegend: true
-      }
-    }
-  }
-
-  const options = Highcharts.merge({}, circleChartTheme, chartOptions)
+  value: 12,
+},
+]
 
-  return (
-    <div>
-      <HighchartsReact
-          highcharts={Highcharts}
-          options={options}
-      />
-    </div>
-  )
-}
+const CircleChartWithLegendKit = (props) => (
+  <div>
+    <CircleChart
+        chartData={dataWithLegend}
+        id="with-legend-example"
+        legend
+        {...props}
+    />
+  </div>
+)
 
-export default CircleChartWithLegendKit
+export default CircleChartWithLegendKit

data/app/pb_kits/playbook/pb_circle_chart/docs/_circle_chart_with_title.jsx

@@ -1,55 +1,47 @@
 import React from 'react'
-import circleChartTheme from '../circleChartTheme'
-import Highcharts from "highcharts"
-import HighchartsReact from "highcharts-react-official"
+
+import CircleChart from '../_circle_chart'
 
 const dataWithTitle = [
   {
     name: 'Facebook',
-    y: 2498,
+    value: 2498,
   },
   {
     name: 'YouTube',
-    y: 2000,
+    value: 2000,
   },
   {
     name: 'WhatsApp',
-    y: 2000,
+    value: 2000,
   },
   {
     name: 'Facebook Messenger',
-    y: 1300,
+    value: 1300,
   },
   {
     name: 'WeChat',
-    y: 1165,
+    value: 1165,
   },
   {
     name: 'Instagram',
-    y: 1000,
+    value: 1000,
   },
   {
     name: 'Tik Tok',
-    y: 800,
+    value: 800,
   },
 ]
 
-const CircleChartWithTitle = () => {
-  const chartOptions = {
-    title: { text: "Active Users on Social Media" },
-    series: [{ data: dataWithTitle }],
-  }
-
-  const options = Highcharts.merge({}, circleChartTheme, chartOptions)
-
-  return (
-    <div>
-      <HighchartsReact
-          highcharts={Highcharts}
-          options={options}
-      />
-    </div>
-  )
-}
+const CircleChartWithLegendKit = (props) => (
+  <div>
+    <CircleChart
+        chartData={dataWithTitle}
+        id="with-title-example"
+        title="Active Users on Social Media"
+        {...props}
+    />
+  </div>
+)
 
-export default CircleChartWithTitle
+export default CircleChartWithLegendKit

data/app/pb_kits/playbook/pb_circle_chart/docs/example.yml

@@ -14,6 +14,7 @@ examples:
 
   react:
   - circle_chart_default: Default Style
+  - circle_chart_pb_styles: Playbook Styles
   - circle_chart_live_data: Live Data
   - circle_chart_rounded: Rounded Corners
   - circle_chart_block: Accepts Any Block

data/app/pb_kits/playbook/pb_circle_chart/docs/index.js

@@ -9,3 +9,4 @@ export { default as CircleChartLegendPosition } from './_circle_chart_legend_pos
 export { default as CircleChartWithTitle } from './_circle_chart_with_title.jsx'
 export { default as CircleChartInnerSizes } from './_circle_chart_inner_sizes.jsx'
 export { default as CircleChartCustomTooltip } from "./_circle_chart_custom_tooltip.jsx"
+export { default as CircleChartPbStyles } from "./_circle_chart_pb_styles.jsx"

data/app/pb_kits/playbook/pb_contact/contact.test.js

@@ -77,12 +77,12 @@ test('returns correct icon', () => {
 
   expect(screen.getByTestId('test-cell').querySelector('.pb_custom_icon')).toBeInTheDocument()
   expect(screen.getByTestId('test-home').querySelector('.pb_custom_icon')).toBeInTheDocument()
-  expect(screen.getByTestId('test-work').querySelector('.pb_custom_icon')).toBeInTheDocument()
+  expect(screen.getByTestId('test-work').querySelector('.pb_icon_kit')).toHaveClass('fa-phone-office')
   expect(screen.getByTestId('test-work-cell').querySelector('.pb_custom_icon')).toBeInTheDocument()
   expect(screen.getByTestId('test-email').querySelector('.pb_custom_icon')).toBeInTheDocument()
   expect(screen.getByTestId('test-wrong-phone').querySelector('.pb_custom_icon')).toBeInTheDocument()
   expect(screen.getByTestId('test-wrong-type').querySelector('.pb_custom_icon')).toBeInTheDocument()
-  expect(screen.getByTestId('test-extension').querySelector('.pb_custom_icon')).toBeInTheDocument()
+  expect(screen.getByTestId('test-extension').querySelector('.pb_icon_kit')).toHaveClass('fa-phone-plus')
   expect(screen.getByTestId('test-empty').querySelector('.pb_custom_icon')).toBeInTheDocument()
 })