Skip to content

Move Jsx and JsxDOM inside Pervasives. #6091

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

Merged
merged 1 commit into from
Mar 22, 2023
Merged

Move Jsx and JsxDOM inside Pervasives. #6091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ These are only breaking changes for unformatted code.
- Add support for `|>` in uncurried mode by desugaring it https://github.com/rescript-lang/rescript-compiler/pull/6083
- Change the compilation of pattern matching for variants so it does not depends on variats being integers https://github.com/rescript-lang/rescript-compiler/pull/6085
- Improve code generated for string templates https://github.com/rescript-lang/rescript-compiler/pull/6090
- Move Jsx and JsxDOM and JsxEvent and JsxPPXReactSupport inside Pervasives and build them separately for curried and uncurried mode https://github.com/rescript-lang/rescript-compiler/pull/6091

# 10.1.4

Expand Down
2 changes: 2 additions & 0 deletions jscomp/others/jsx.res → jscomp/others/jsxC.res
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */

/*** Internal: use Jsx directly. */

type element
type ref

Expand Down
164 changes: 83 additions & 81 deletions jscomp/others/jsxDOM.res → jscomp/others/jsxDOMC.res
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */

/*** Internal: use JsxDOM directly. */

type style = JsxDOMStyle.t
type domRef

Expand All @@ -30,7 +32,7 @@ type domRef
*/
type domProps = {
key?: string,
children?: Jsx.element,
children?: JsxC.element,
ref?: domRef,
/* accessibility */
/* https://www.w3.org/TR/wai-aria-1.1/ */
Expand Down Expand Up @@ -260,100 +262,100 @@ type domProps = {
width?: string /* in html5 this can only be a number, but in html4 it can ba a percentage as well */,
wrap?: string /* "hard" or "soft" */,
/* Clipboard events */
onCopy?: JsxEvent.Clipboard.t => unit,
onCut?: JsxEvent.Clipboard.t => unit,
onPaste?: JsxEvent.Clipboard.t => unit,
onCopy?: JsxEventC.Clipboard.t => unit,
onCut?: JsxEventC.Clipboard.t => unit,
onPaste?: JsxEventC.Clipboard.t => unit,
/* Composition events */
onCompositionEnd?: JsxEvent.Composition.t => unit,
onCompositionStart?: JsxEvent.Composition.t => unit,
onCompositionUpdate?: JsxEvent.Composition.t => unit,
onCompositionEnd?: JsxEventC.Composition.t => unit,
onCompositionStart?: JsxEventC.Composition.t => unit,
onCompositionUpdate?: JsxEventC.Composition.t => unit,
/* Keyboard events */
onKeyDown?: JsxEvent.Keyboard.t => unit,
onKeyPress?: JsxEvent.Keyboard.t => unit,
onKeyUp?: JsxEvent.Keyboard.t => unit,
onKeyDown?: JsxEventC.Keyboard.t => unit,
onKeyPress?: JsxEventC.Keyboard.t => unit,
onKeyUp?: JsxEventC.Keyboard.t => unit,
/* Focus events */
onFocus?: JsxEvent.Focus.t => unit,
onBlur?: JsxEvent.Focus.t => unit,
onFocus?: JsxEventC.Focus.t => unit,
onBlur?: JsxEventC.Focus.t => unit,
/* Form events */
onBeforeInput?: JsxEvent.Form.t => unit,
onChange?: JsxEvent.Form.t => unit,
onInput?: JsxEvent.Form.t => unit,
onReset?: JsxEvent.Form.t => unit,
onSubmit?: JsxEvent.Form.t => unit,
onInvalid?: JsxEvent.Form.t => unit,
onBeforeInput?: JsxEventC.Form.t => unit,
onChange?: JsxEventC.Form.t => unit,
onInput?: JsxEventC.Form.t => unit,
onReset?: JsxEventC.Form.t => unit,
onSubmit?: JsxEventC.Form.t => unit,
onInvalid?: JsxEventC.Form.t => unit,
/* Mouse events */
onClick?: JsxEvent.Mouse.t => unit,
onContextMenu?: JsxEvent.Mouse.t => unit,
onDoubleClick?: JsxEvent.Mouse.t => unit,
onDrag?: JsxEvent.Mouse.t => unit,
onDragEnd?: JsxEvent.Mouse.t => unit,
onDragEnter?: JsxEvent.Mouse.t => unit,
onDragExit?: JsxEvent.Mouse.t => unit,
onDragLeave?: JsxEvent.Mouse.t => unit,
onDragOver?: JsxEvent.Mouse.t => unit,
onDragStart?: JsxEvent.Mouse.t => unit,
onDrop?: JsxEvent.Mouse.t => unit,
onMouseDown?: JsxEvent.Mouse.t => unit,
onMouseEnter?: JsxEvent.Mouse.t => unit,
onMouseLeave?: JsxEvent.Mouse.t => unit,
onMouseMove?: JsxEvent.Mouse.t => unit,
onMouseOut?: JsxEvent.Mouse.t => unit,
onMouseOver?: JsxEvent.Mouse.t => unit,
onMouseUp?: JsxEvent.Mouse.t => unit,
onClick?: JsxEventC.Mouse.t => unit,
onContextMenu?: JsxEventC.Mouse.t => unit,
onDoubleClick?: JsxEventC.Mouse.t => unit,
onDrag?: JsxEventC.Mouse.t => unit,
onDragEnd?: JsxEventC.Mouse.t => unit,
onDragEnter?: JsxEventC.Mouse.t => unit,
onDragExit?: JsxEventC.Mouse.t => unit,
onDragLeave?: JsxEventC.Mouse.t => unit,
onDragOver?: JsxEventC.Mouse.t => unit,
onDragStart?: JsxEventC.Mouse.t => unit,
onDrop?: JsxEventC.Mouse.t => unit,
onMouseDown?: JsxEventC.Mouse.t => unit,
onMouseEnter?: JsxEventC.Mouse.t => unit,
onMouseLeave?: JsxEventC.Mouse.t => unit,
onMouseMove?: JsxEventC.Mouse.t => unit,
onMouseOut?: JsxEventC.Mouse.t => unit,
onMouseOver?: JsxEventC.Mouse.t => unit,
onMouseUp?: JsxEventC.Mouse.t => unit,
/* Selection events */
onSelect?: JsxEvent.Selection.t => unit,
onSelect?: JsxEventC.Selection.t => unit,
/* Touch events */
onTouchCancel?: JsxEvent.Touch.t => unit,
onTouchEnd?: JsxEvent.Touch.t => unit,
onTouchMove?: JsxEvent.Touch.t => unit,
onTouchStart?: JsxEvent.Touch.t => unit,
onTouchCancel?: JsxEventC.Touch.t => unit,
onTouchEnd?: JsxEventC.Touch.t => unit,
onTouchMove?: JsxEventC.Touch.t => unit,
onTouchStart?: JsxEventC.Touch.t => unit,
// Pointer events
onPointerOver?: JsxEvent.Pointer.t => unit,
onPointerEnter?: JsxEvent.Pointer.t => unit,
onPointerDown?: JsxEvent.Pointer.t => unit,
onPointerMove?: JsxEvent.Pointer.t => unit,
onPointerUp?: JsxEvent.Pointer.t => unit,
onPointerCancel?: JsxEvent.Pointer.t => unit,
onPointerOut?: JsxEvent.Pointer.t => unit,
onPointerLeave?: JsxEvent.Pointer.t => unit,
onGotPointerCapture?: JsxEvent.Pointer.t => unit,
onLostPointerCapture?: JsxEvent.Pointer.t => unit,
onPointerOver?: JsxEventC.Pointer.t => unit,
onPointerEnter?: JsxEventC.Pointer.t => unit,
onPointerDown?: JsxEventC.Pointer.t => unit,
onPointerMove?: JsxEventC.Pointer.t => unit,
onPointerUp?: JsxEventC.Pointer.t => unit,
onPointerCancel?: JsxEventC.Pointer.t => unit,
onPointerOut?: JsxEventC.Pointer.t => unit,
onPointerLeave?: JsxEventC.Pointer.t => unit,
onGotPointerCapture?: JsxEventC.Pointer.t => unit,
onLostPointerCapture?: JsxEventC.Pointer.t => unit,
/* UI events */
onScroll?: JsxEvent.UI.t => unit,
onScroll?: JsxEventC.UI.t => unit,
/* Wheel events */
onWheel?: JsxEvent.Wheel.t => unit,
onWheel?: JsxEventC.Wheel.t => unit,
/* Media events */
onAbort?: JsxEvent.Media.t => unit,
onCanPlay?: JsxEvent.Media.t => unit,
onCanPlayThrough?: JsxEvent.Media.t => unit,
onDurationChange?: JsxEvent.Media.t => unit,
onEmptied?: JsxEvent.Media.t => unit,
onEncrypted?: JsxEvent.Media.t => unit,
onEnded?: JsxEvent.Media.t => unit,
onError?: JsxEvent.Media.t => unit,
onLoadedData?: JsxEvent.Media.t => unit,
onLoadedMetadata?: JsxEvent.Media.t => unit,
onLoadStart?: JsxEvent.Media.t => unit,
onPause?: JsxEvent.Media.t => unit,
onPlay?: JsxEvent.Media.t => unit,
onPlaying?: JsxEvent.Media.t => unit,
onProgress?: JsxEvent.Media.t => unit,
onRateChange?: JsxEvent.Media.t => unit,
onSeeked?: JsxEvent.Media.t => unit,
onSeeking?: JsxEvent.Media.t => unit,
onStalled?: JsxEvent.Media.t => unit,
onSuspend?: JsxEvent.Media.t => unit,
onTimeUpdate?: JsxEvent.Media.t => unit,
onVolumeChange?: JsxEvent.Media.t => unit,
onWaiting?: JsxEvent.Media.t => unit,
onAbort?: JsxEventC.Media.t => unit,
onCanPlay?: JsxEventC.Media.t => unit,
onCanPlayThrough?: JsxEventC.Media.t => unit,
onDurationChange?: JsxEventC.Media.t => unit,
onEmptied?: JsxEventC.Media.t => unit,
onEncrypted?: JsxEventC.Media.t => unit,
onEnded?: JsxEventC.Media.t => unit,
onError?: JsxEventC.Media.t => unit,
onLoadedData?: JsxEventC.Media.t => unit,
onLoadedMetadata?: JsxEventC.Media.t => unit,
onLoadStart?: JsxEventC.Media.t => unit,
onPause?: JsxEventC.Media.t => unit,
onPlay?: JsxEventC.Media.t => unit,
onPlaying?: JsxEventC.Media.t => unit,
onProgress?: JsxEventC.Media.t => unit,
onRateChange?: JsxEventC.Media.t => unit,
onSeeked?: JsxEventC.Media.t => unit,
onSeeking?: JsxEventC.Media.t => unit,
onStalled?: JsxEventC.Media.t => unit,
onSuspend?: JsxEventC.Media.t => unit,
onTimeUpdate?: JsxEventC.Media.t => unit,
onVolumeChange?: JsxEventC.Media.t => unit,
onWaiting?: JsxEventC.Media.t => unit,
/* Image events */
onLoad?: JsxEvent.Image.t => unit /* duplicate */ /* ~onError: ReactEvent.Image.t => unit=?, */,
onLoad?: JsxEventC.Image.t => unit /* duplicate */ /* ~onError: ReactEvent.Image.t => unit=?, */,
/* Animation events */
onAnimationStart?: JsxEvent.Animation.t => unit,
onAnimationEnd?: JsxEvent.Animation.t => unit,
onAnimationIteration?: JsxEvent.Animation.t => unit,
onAnimationStart?: JsxEventC.Animation.t => unit,
onAnimationEnd?: JsxEventC.Animation.t => unit,
onAnimationIteration?: JsxEventC.Animation.t => unit,
/* Transition events */
onTransitionEnd?: JsxEvent.Transition.t => unit,
onTransitionEnd?: JsxEventC.Transition.t => unit,
/* svg */
accentHeight?: string,
accumulate?: string,
Expand Down
Loading