Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates to bindings for XYZ axes, Treemap, Pie, and Cell components #59

Merged
merged 9 commits into from
Dec 2, 2024
+416 −74
Merged

Updates to bindings for XYZ axes, Treemap, Pie, and Cell components #59

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d4cfcbd
fix curried event handlers
johnhaley81 Nov 23, 2024
4553b69
uppdate dataKey, tickSize, transform, and stroke for XYZ axes
johnhaley81 Nov 23, 2024
d9c2068
add fillOpacity to Cell
johnhaley81 Nov 23, 2024
0e07da3
add optional flags to optional Treemap props
johnhaley81 Nov 23, 2024
602f743
wrap first prop in Pie event handlers with Js.Nullable.t
johnhaley81 Nov 23, 2024
a2359bb
update CHANGES
johnhaley81 Nov 23, 2024
db7dbb6
replace "any" types with more correct types for XYZ axes
johnhaley81 Nov 27, 2024
527b615
update CHANGES to be less verbose
johnhaley81 Dec 2, 2024
edcbe31
change `Component to `Element
johnhaley81 Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
## 5.0.0 (2024-11-26)

- fix curried functions in event handlers for `XAxis`, `YAxis`, and `ZAxis`
- change `dataKey` type from `string` to `'dataKey` in `XAxis`, `YAxis`, and `ZAxis`
- change `tickSize` type from `int` to `float` in `XAxis`, `YAxis`, and `ZAxis`
- add `transform` and `stroke` props to `XAxis`, `YAxis`, and `ZAxis`
- add `style` prop to `ZAxis`
- add `fillOpacity` prop to `Cell`
- add optional flags to `Treemap` props `stroke`, `fill`, `isAnimationActive`, `animationDuration`
- wrap `Pie` event handlers data prop in `Js.Nullable.t`

## 4.0.7 (2024-11-23)

- add `payload` to `Pie` and `Bar` event handler
Expand Down
9 changes: 8 additions & 1 deletion src/Cell.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

[@mel.module "recharts"] [@react.component]
external make:
(~background: 'background=?, ~className: string=?, ~fill: string=?, ~stroke: string=?, ~strokeWidth: int=?) =>
(
~background: 'background=?,
~className: string=?,
~fill: string=?,
~fillOpacity: float=?,
~stroke: string=?,
~strokeWidth: int=?
) =>
React.element =
"Cell";
39 changes: 26 additions & 13 deletions src/Pie.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,39 +35,52 @@ external make:
// Pulled from:
// https://github.com/recharts/recharts/blob/7fb227dae542c3d3093506e6d80a2c2c366f9a26/src/polar/Pie.tsx#L107-L109
~onClick:
(Js.Nullable.t({.. "payload": 'dataItem}), int, React.Event.Mouse.t) =>
unit
=?,
~onMouseEnter:
(Js.Nullable.t({.. "payload": 'dataItem}), int, React.Event.Mouse.t) =>
unit
=?,
~onMouseLeave:
(Js.Nullable.t({.. "payload": 'dataItem}), int, React.Event.Mouse.t) =>
unit
=?,
~onMouseDown:
(
Js.Nullable.t(Js.t({.. "payload": 'dataItem})),
int,
React.Event.Mouse.t
) =>
unit
=?,
~onMouseDown:
(Js.t({.. "payload": 'dataItem}), React.Event.Mouse.t) => unit=?,
~onMouseEnter:
~onMouseMove:
(
Js.Nullable.t(Js.t({.. "payload": 'dataItem})),
int,
React.Event.Mouse.t
) =>
unit
=?,
~onMouseLeave:
~onMouseOut:
(
Js.Nullable.t(Js.t({.. "payload": 'dataItem})),
int,
React.Event.Mouse.t
) =>
unit
=?,
~onMouseMove:
(Js.t({.. "payload": 'dataItem}), React.Event.Mouse.t) => unit=?,
~onMouseOut:
(Js.t({.. "payload": 'dataItem}), React.Event.Mouse.t) => unit=?,
~onMouseOver:
(Js.t({.. "payload": 'dataItem}), React.Event.Mouse.t) => unit=?,
(
Js.Nullable.t(Js.t({.. "payload": 'dataItem})),
React.Event.Mouse.t
) =>
unit
=?,
~onMouseUp:
(Js.t({.. "payload": 'dataItem}), React.Event.Mouse.t) => unit=?,
(
Js.Nullable.t(Js.t({.. "payload": 'dataItem})),
React.Event.Mouse.t
) =>
unit
=?,
~outerRadius: PxOrPrc.t=?,
~paddingAngle: int=?,
~startAngle: int=?,
Expand Down
8 changes: 4 additions & 4 deletions src/Treemap.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ external make:
~data: array('dataItem),
~dataKey: string,
~aspectRatio: float=?,
~stroke: string,
~fill: string,
~stroke: string=?,
~fill: string=?,
~className: string=?,
~height: int=?,
~isAnimationActive: bool,
~animationDuration: int,
~isAnimationActive: bool=?,
~animationDuration: int=?,
~syncId: string=?,
~width: int=?,
~content: 'contentProps => React.element=?,
Expand Down
81 changes: 69 additions & 12 deletions src/XAxis.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ external make:
~allowDuplicatedCategory: bool=?,
~axisLine: 'axisLine=?,
~className: string=?,
~dataKey: string=?,
~dataKey: 'dataKey=?,
~domain: array('domain)=?,
~height: int=?,
~hide: bool=?,
Expand All @@ -19,15 +19,19 @@ external make:
~minTickGap: int=?,
~mirror: bool=?,
~name: string=?,
~onClick: (Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
~onMouseDown: (Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
~onClick: (. Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
~onMouseDown:
(. Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
~onMouseEnter:
(Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
~onMouseLeave: (Js.t({..}), React.Event.Mouse.t) => unit=?,
~onMouseMove: (Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
~onMouseOut: (Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
~onMouseOver: (Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
~onMouseUp: (Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
(. Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
~onMouseLeave: (. Js.t({..}), React.Event.Mouse.t) => unit=?,
~onMouseMove:
(. Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
~onMouseOut:
(. Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
~onMouseOver:
(. Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
~onMouseUp: (. Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
~orientation:
[
| `bottom
Expand All @@ -37,20 +41,73 @@ external make:
~padding: paddingHorizontal=?,
~reversed: bool=?,
~scale: scale=?,
~stroke: string=?,
~style: ReactDOM.Style.t=?,
~tick: 'tick=?,
~tickCount: int=?,
~tickFormatter: 'tickFormatter=?,
~tickLine: 'tickLine=?,
~tickMargin: int=?,
~ticks: array('ticks)=?,
~tickSize: int=?,
~tickSize: float=?,
~transform: string=?,
~unit: string=?,
~width: int=?,
~xAxisId: string=?
) =>
React.element =
"XAxis";

let makeProps = (~interval=?) =>
makeProps(~interval=?interval->AxisInterval.encodeOpt);
let makeProps =
(
~interval=?,
~onClick=?,
~onMouseDown=?,
~onMouseEnter=?,
~onMouseLeave=?,
~onMouseMove=?,
~onMouseOut=?,
~onMouseOver=?,
~onMouseUp=?,
) =>
makeProps(
~interval=?interval->AxisInterval.encodeOpt,
~onClick=?
onClick
|> Option.map(onClick => (. payload, event) => onClick(payload, event)),
~onMouseDown=?
onMouseDown
|> Option.map(onMouseDown =>
(. payload, event) => onMouseDown(payload, event)
),
~onMouseEnter=?
onMouseEnter
|> Option.map(onMouseEnter =>
(. payload, event) => onMouseEnter(payload, event)
),
~onMouseLeave=?
onMouseLeave
|> Option.map(onMouseLeave =>
(. payload, event) => onMouseLeave(payload, event)
),
~onMouseMove=?
onMouseMove
|> Option.map(onMouseMove =>
(. payload, event) => onMouseMove(payload, event)
),
~onMouseOut=?
onMouseOut
|> Option.map(onMouseOut =>
(. payload, event) => onMouseOut(payload, event)
),
~onMouseOver=?
onMouseOver
|> Option.map(onMouseOver =>
(. payload, event) => onMouseOver(payload, event)
),
~onMouseUp=?
onMouseUp
|> Option.map(onMouseUp =>
(. payload, event) => onMouseUp(payload, event)
),
);
81 changes: 69 additions & 12 deletions src/YAxis.re
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ external make:
~allowDuplicatedCategory: bool=?,
~axisLine: 'axisLine=?,
~className: string=?,
~dataKey: string=?,
~dataKey: 'dataKey=?,
~domain: array('domain)=?,
~height: int=?,
~hide: bool=?,
Expand All @@ -19,15 +19,19 @@ external make:
~minTickGap: int=?,
~mirror: bool=?,
~name: string=?,
~onClick: (Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
~onMouseDown: (Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
~onClick: (. Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
~onMouseDown:
(. Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
~onMouseEnter:
(Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
~onMouseLeave: (Js.t({..}), React.Event.Mouse.t) => unit=?,
~onMouseMove: (Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
~onMouseOut: (Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
~onMouseOver: (Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
~onMouseUp: (Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
(. Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
~onMouseLeave: (. Js.t({..}), React.Event.Mouse.t) => unit=?,
~onMouseMove:
(. Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
~onMouseOut:
(. Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
~onMouseOver:
(. Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
~onMouseUp: (. Js.Nullable.t(Js.t({..})), React.Event.Mouse.t) => unit=?,
~orientation:
[
| `left
Expand All @@ -37,20 +41,73 @@ external make:
~padding: paddingVertical=?,
~reversed: bool=?,
~scale: scale=?,
~stroke: string=?,
~style: ReactDOM.Style.t=?,
~tick: 'tick=?,
~tickCount: int=?,
~tickFormatter: 'tickFormatter=?,
~tickLine: 'tickLine=?,
~tickMargin: int=?,
~ticks: array('ticks)=?,
~tickSize: int=?,
~tickSize: float=?,
~transform: string=?,
~unit: string=?,
~width: int=?,
~yAxisId: string=?
) =>
React.element =
"YAxis";

let makeProps = (~interval=?) =>
makeProps(~interval=?interval->AxisInterval.encodeOpt);
let makeProps =
(
~interval=?,
~onClick=?,
~onMouseDown=?,
~onMouseEnter=?,
~onMouseLeave=?,
~onMouseMove=?,
~onMouseOut=?,
~onMouseOver=?,
~onMouseUp=?,
) =>
makeProps(
~interval=?interval |> AxisInterval.encodeOpt,
~onClick=?
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This adds some extra runtime (example). But I guess we're fine with it? cc @davesnx

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It already had the runtime on it with interval |> AxisInterval.encodeOpt here so I figured it was ok but I can rip these out.

I included them mostly to help upgrading since you'd have to rewrite all of the functions to be uncurried otherwise but since these have breaking changes in them anyways maybe that's ok?

onClick
|> Option.map(onClick => (. payload, event) => onClick(payload, event)),
~onMouseDown=?
onMouseDown
|> Option.map(onMouseDown =>
(. payload, event) => onMouseDown(payload, event)
),
~onMouseEnter=?
onMouseEnter
|> Option.map(onMouseEnter =>
(. payload, event) => onMouseEnter(payload, event)
),
~onMouseLeave=?
onMouseLeave
|> Option.map(onMouseLeave =>
(. payload, event) => onMouseLeave(payload, event)
),
~onMouseMove=?
onMouseMove
|> Option.map(onMouseMove =>
(. payload, event) => onMouseMove(payload, event)
),
~onMouseOut=?
onMouseOut
|> Option.map(onMouseOut =>
(. payload, event) => onMouseOut(payload, event)
),
~onMouseOver=?
onMouseOver
|> Option.map(onMouseOver =>
(. payload, event) => onMouseOver(payload, event)
),
~onMouseUp=?
onMouseUp
|> Option.map(onMouseUp =>
(. payload, event) => onMouseUp(payload, event)
),
);
Loading
Loading