From 9cb098df0ad5978b0e9aac78b4c68c9d16759f0f Mon Sep 17 00:00:00 2001 From: Joffrey Bion Date: Mon, 7 Sep 2020 23:36:44 +0200 Subject: Format with trailing comma --- .../kotlin/com/palantir/blueprintjs/BpButtons.kt | 16 +++++++++ .../kotlin/com/palantir/blueprintjs/BpCallout.kt | 1 + .../main/kotlin/com/palantir/blueprintjs/BpCard.kt | 1 + .../kotlin/com/palantir/blueprintjs/BpDivider.kt | 1 + .../kotlin/com/palantir/blueprintjs/BpHtmlTable.kt | 1 + .../main/kotlin/com/palantir/blueprintjs/BpIcon.kt | 5 +++ .../kotlin/com/palantir/blueprintjs/BpInputs.kt | 10 ++++++ .../com/palantir/blueprintjs/BpNonIdealState.kt | 1 + .../kotlin/com/palantir/blueprintjs/BpOverlay.kt | 21 ++++++++++++ .../kotlin/com/palantir/blueprintjs/BpPopover.kt | 1 + .../main/kotlin/com/palantir/blueprintjs/BpTag.kt | 11 ++++++ .../kotlin/com/palantir/blueprintjs/blueprintjs.kt | 10 ++++++ .../com/palantir/blueprintjs/blueprintjsHelpers.kt | 26 +++++++------- .../sevenwonders/ui/components/game/Board.kt | 4 +-- .../ui/components/game/BoardSummary.kt | 40 ++++++++++++---------- .../sevenwonders/ui/components/game/CardImage.kt | 6 ++-- .../sevenwonders/ui/components/game/GameScene.kt | 40 +++++++++++++++------- .../luxons/sevenwonders/ui/components/game/Hand.kt | 34 ++++++++++++------ .../ui/components/game/PreparedMove.kt | 4 +-- .../sevenwonders/ui/components/game/ScoreTable.kt | 15 ++++++-- .../sevenwonders/ui/components/game/Tokens.kt | 20 +++++++---- .../ui/components/gameBrowser/CreateGameForm.kt | 9 +++-- .../ui/components/gameBrowser/GameList.kt | 10 ++++-- .../ui/components/gameBrowser/PlayerInfo.kt | 4 +-- .../ui/components/home/ChooseNameForm.kt | 12 +++++-- .../sevenwonders/ui/components/lobby/Lobby.kt | 18 +++++----- .../sevenwonders/ui/components/lobby/RadialList.kt | 10 ++++-- .../sevenwonders/ui/components/lobby/RadialMath.kt | 8 ++--- .../ui/components/lobby/RadialPlayerList.kt | 23 ++++++------- .../org/luxons/sevenwonders/ui/redux/Reducers.kt | 16 +++++---- .../org/luxons/sevenwonders/ui/redux/Store.kt | 2 +- .../org/luxons/sevenwonders/ui/redux/Utils.kt | 8 ++--- .../ui/redux/sagas/GameBrowserSagas.kt | 2 +- .../sevenwonders/ui/redux/sagas/GameSagas.kt | 9 ++++- .../sevenwonders/ui/redux/sagas/LobbySagas.kt | 14 +++++--- .../sevenwonders/ui/redux/sagas/SagasFramework.kt | 6 ++-- .../org/luxons/sevenwonders/ui/router/Router.kt | 2 +- sw-ui/src/main/resources/index.html | 6 ++-- 38 files changed, 294 insertions(+), 133 deletions(-) (limited to 'sw-ui/src/main') diff --git a/sw-ui/src/main/kotlin/com/palantir/blueprintjs/BpButtons.kt b/sw-ui/src/main/kotlin/com/palantir/blueprintjs/BpButtons.kt index 8b6ce30a..7438e0ba 100644 --- a/sw-ui/src/main/kotlin/com/palantir/blueprintjs/BpButtons.kt +++ b/sw-ui/src/main/kotlin/com/palantir/blueprintjs/BpButtons.kt @@ -1,4 +1,5 @@ @file:JsModule("@blueprintjs/core") + package com.palantir.blueprintjs import org.w3c.dom.HTMLElement @@ -14,10 +15,13 @@ import react.ReactElement external interface IActionProps : IIntentProps, IProps { /** Whether this action is non-interactive. */ var disabled: Boolean? + /** Name of a Blueprint UI icon (or an icon element) to render before the text. */ var icon: IconName? + /** Click event handler. */ var onClick: ((event: MouseEvent) -> Unit)? + /** Action text. Can be any single React renderable. */ var text: String? } @@ -25,12 +29,14 @@ external interface IActionProps : IIntentProps, IProps { external interface IButtonProps : IActionProps { // artificially added to allow title on button (should probably be on more general props) var title: String? + /** * If set to `true`, the button will display in an active state. * This is equivalent to setting `className={Classes.ACTIVE}`. * @default false */ var active: Boolean? + /** * Text alignment within button. By default, icons and text will be centered * within the button. Passing `"left"` or `"right"` will align the button @@ -39,26 +45,35 @@ external interface IButtonProps : IActionProps { * @default Alignment.CENTER */ var alignText: Alignment? + /** A ref handler that receives the native HTML element backing this component. */ var elementRef: ((ref: HTMLElement?) -> Any)? + /** Whether this button should expand to fill its container. */ var fill: Boolean? + /** Whether this button should use large styles. */ var large: Boolean? + /** * If set to `true`, the button will display a centered loading spinner instead of its contents. * The width of the button is not affected by the value of this prop. * @default false */ var loading: Boolean? + /** Whether this button should use minimal styles. */ var minimal: Boolean? + /** Whether this button should use outlined styles. */ var outlined: Boolean? + /** Name of a Blueprint UI icon (or an icon element) to render after the text. */ var rightIcon: IconName? + /** Whether this button should use small styles. */ var small: Boolean? + /** * HTML `type` attribute of button. Accepted values are `"button"`, `"submit"`, and `"reset"`. * Note that this prop has no effect on `AnchorButton`; it only affects `Button`. @@ -76,6 +91,7 @@ abstract external class AbstractButton : PureComponent` instead. */ var icon: IconName + /** * Size of the icon, in pixels. Blueprint contains 16px and 20px SVG icon * images, and chooses the appropriate resolution based on this prop. @@ -48,6 +52,7 @@ external interface IIconProps : IIntentProps, IProps { * @default "span" */ var tagName: String? // keyof JSX.IntrinsicElements + /** * Description string. This string does not appear in normal browsers, but * it increases accessibility. For instance, screen readers will use it for diff --git a/sw-ui/src/main/kotlin/com/palantir/blueprintjs/BpInputs.kt b/sw-ui/src/main/kotlin/com/palantir/blueprintjs/BpInputs.kt index 4eaadb78..90178a9b 100644 --- a/sw-ui/src/main/kotlin/com/palantir/blueprintjs/BpInputs.kt +++ b/sw-ui/src/main/kotlin/com/palantir/blueprintjs/BpInputs.kt @@ -1,4 +1,5 @@ @file:JsModule("@blueprintjs/core") + package com.palantir.blueprintjs import org.w3c.dom.HTMLInputElement @@ -13,30 +14,39 @@ external interface IInputGroupProps : IControlledProps, IIntentProps, IProps { * @default false */ var disabled: Boolean? + /** * Whether the component should take up the full width of its container. */ var fill: Boolean? + /** Ref handler that receives HTML `` element backing this component. */ var inputRef: ((ref: HTMLInputElement?) -> Any)? + /** * Name of a Blueprint UI icon (or an icon element) to render on the left side of the input group, * before the user's cursor. */ var leftIcon: IconName? + /** Whether this input should use large styles. */ var large: Boolean? + /** Whether this input should use small styles. */ var small: Boolean? + /** Placeholder text in the absence of any value. */ var placeholder: String? + /** * Element to render on right side of input. * For best results, use a minimal button, tag, or small spinner. */ var rightElement: ReactElement? + /** Whether the input (and any buttons) should appear with rounded caps. */ var round: Boolean? + /** * HTML `input` type attribute. * @default "text" diff --git a/sw-ui/src/main/kotlin/com/palantir/blueprintjs/BpNonIdealState.kt b/sw-ui/src/main/kotlin/com/palantir/blueprintjs/BpNonIdealState.kt index f6ca7aec..7bc4fa0d 100644 --- a/sw-ui/src/main/kotlin/com/palantir/blueprintjs/BpNonIdealState.kt +++ b/sw-ui/src/main/kotlin/com/palantir/blueprintjs/BpNonIdealState.kt @@ -1,4 +1,5 @@ @file:JsModule("@blueprintjs/core") + package com.palantir.blueprintjs import react.PureComponent diff --git a/sw-ui/src/main/kotlin/com/palantir/blueprintjs/BpOverlay.kt b/sw-ui/src/main/kotlin/com/palantir/blueprintjs/BpOverlay.kt index 254b5bb3..7c2f3c43 100644 --- a/sw-ui/src/main/kotlin/com/palantir/blueprintjs/BpOverlay.kt +++ b/sw-ui/src/main/kotlin/com/palantir/blueprintjs/BpOverlay.kt @@ -1,4 +1,5 @@ @file:JsModule("@blueprintjs/core") + package com.palantir.blueprintjs import org.w3c.dom.HTMLElement @@ -14,11 +15,13 @@ external interface IOverlayableProps : IOverlayLifecycleProps { * @default true */ var autoFocus: Boolean? + /** * Whether pressing the `esc` key should invoke `onClose`. * @default true */ var canEscapeKeyClose: Boolean? + /** * Whether the overlay should prevent focus from leaving itself. That is, if the user attempts * to focus an element outside the overlay and this prop is enabled, then the overlay will @@ -27,6 +30,7 @@ external interface IOverlayableProps : IOverlayLifecycleProps { * @default true */ var enforceFocus: Boolean? + /** * If `true` and `usePortal={true}`, the `Portal` containing the children is created and attached * to the DOM when the overlay is opened for the first time; otherwise this happens when the @@ -35,6 +39,7 @@ external interface IOverlayableProps : IOverlayLifecycleProps { * @default true */ var lazy: Boolean? + /** * Indicates how long (in milliseconds) the overlay's enter/leave transition takes. * This is used by React `CSSTransition` to know when a transition completes and must match @@ -43,6 +48,7 @@ external interface IOverlayableProps : IOverlayLifecycleProps { * @default 300 */ var transitionDuration: Int? + /** * Whether the overlay should be wrapped in a `Portal`, which renders its contents in a new * element attached to `portalContainer` prop. @@ -56,17 +62,20 @@ external interface IOverlayableProps : IOverlayLifecycleProps { * @default true */ var usePortal: Boolean? + /** * Space-delimited string of class names applied to the `Portal` element if * `usePortal={true}`. */ var portalClassName: String? + /** * The container element into which the overlay renders its contents, when `usePortal` is `true`. * This prop is ignored if `usePortal` is `false`. * @default document.body */ var portalContainer: HTMLElement? + /** * A callback that is invoked when user interaction causes the overlay to close, such as * clicking on the overlay or pressing the `esc` key (if enabled). @@ -77,53 +86,63 @@ external interface IOverlayableProps : IOverlayLifecycleProps { */ var onClose: ((Event) -> Unit)? } + external interface IOverlayLifecycleProps { /** * Lifecycle method invoked just before the CSS _close_ transition begins on * a child. Receives the DOM element of the child being closed. */ var onClosing: ((node: HTMLElement) -> Unit)? + /** * Lifecycle method invoked just after the CSS _close_ transition ends but * before the child has been removed from the DOM. Receives the DOM element * of the child being closed. */ var onClosed: ((node: HTMLElement) -> Unit)? + /** * Lifecycle method invoked just after mounting the child in the DOM but * just before the CSS _open_ transition begins. Receives the DOM element of * the child being opened. */ var onOpening: ((node: HTMLElement) -> Unit)? + /** * Lifecycle method invoked just after the CSS _open_ transition ends. * Receives the DOM element of the child being opened. */ var onOpened: ((node: HTMLElement) -> Unit)? } + external interface IBackdropProps { /** CSS class names to apply to backdrop element. */ var backdropClassName: String? + /** HTML props for the backdrop element. */ var backdropProps: RProps? // React.HTMLProps? + /** * Whether clicking outside the overlay element (either on backdrop when present or on document) * should invoke `onClose`. * @default true */ var canOutsideClickClose: Boolean? + /** * Whether a container-spanning backdrop element should be rendered behind the contents. * @default true */ var hasBackdrop: Boolean? } + external interface IOverlayProps : IOverlayableProps, IBackdropProps, IProps { /** * Toggles the visibility of the overlay and its children. * This prop is required because the component is controlled. */ var isOpen: Boolean + /** * Name of the transition for internal `CSSTransition`. * Providing your own name here will require defining new CSS transition properties. @@ -131,9 +150,11 @@ external interface IOverlayProps : IOverlayableProps, IBackdropProps, IProps { */ var transitionName: String? } + external interface IOverlayState : RState { var hasEverOpened: Boolean? } + external class Overlay : PureComponent { override fun render(): ReactElement } diff --git a/sw-ui/src/main/kotlin/com/palantir/blueprintjs/BpPopover.kt b/sw-ui/src/main/kotlin/com/palantir/blueprintjs/BpPopover.kt index 1c610579..57093a25 100644 --- a/sw-ui/src/main/kotlin/com/palantir/blueprintjs/BpPopover.kt +++ b/sw-ui/src/main/kotlin/com/palantir/blueprintjs/BpPopover.kt @@ -1,4 +1,5 @@ @file:JsModule("@blueprintjs/core") + package com.palantir.blueprintjs import org.w3c.dom.HTMLDivElement diff --git a/sw-ui/src/main/kotlin/com/palantir/blueprintjs/BpTag.kt b/sw-ui/src/main/kotlin/com/palantir/blueprintjs/BpTag.kt index 7a2a04f2..a3727af9 100644 --- a/sw-ui/src/main/kotlin/com/palantir/blueprintjs/BpTag.kt +++ b/sw-ui/src/main/kotlin/com/palantir/blueprintjs/BpTag.kt @@ -1,4 +1,5 @@ @file:JsModule("@blueprintjs/core") + package com.palantir.blueprintjs import org.w3c.dom.events.MouseEvent @@ -12,13 +13,16 @@ external interface ITagProps : IProps, IIntentProps { * @default false */ var active: Boolean? + /** * Whether the tag should take up the full width of its container. * @default false */ var fill: Boolean? + /** Name of a Blueprint UI icon (or an icon element) to render before the children. */ var icon: IconName? + /** * Whether the tag should visually respond to user interactions. If set * to `true`, hovering over the tag will change its color and mouse cursor. @@ -28,16 +32,19 @@ external interface ITagProps : IProps, IIntentProps { * @default false */ var interactive: Boolean? + /** * Whether this tag should use large styles. * @default false */ var large: Boolean? + /** * Whether this tag should use minimal styles. * @default false */ var minimal: Boolean? + /** * Whether tag content should be allowed to occupy multiple lines. * If false, a single line of text will be truncated with an ellipsis if @@ -46,18 +53,22 @@ external interface ITagProps : IProps, IIntentProps { * @default false */ var multiline: Boolean? + /** * Callback invoked when the tag is clicked. * Recommended when `interactive` is `true`. */ var onClick: ((e: MouseEvent) -> Unit)? + /** * Click handler for remove button. * The remove button will only be rendered if this prop is defined. */ var onRemove: ((e: MouseEvent, tagProps: ITagProps) -> Unit)? + /** Name of a Blueprint UI icon (or an icon element) to render after the children. */ var rightIcon: IconName? + /** * Whether this tag should have rounded ends. * @default false diff --git a/sw-ui/src/main/kotlin/com/palantir/blueprintjs/blueprintjs.kt b/sw-ui/src/main/kotlin/com/palantir/blueprintjs/blueprintjs.kt index 7da41fc9..8063f98e 100644 --- a/sw-ui/src/main/kotlin/com/palantir/blueprintjs/blueprintjs.kt +++ b/sw-ui/src/main/kotlin/com/palantir/blueprintjs/blueprintjs.kt @@ -1,4 +1,5 @@ @file:JsModule("@blueprintjs/core") + package com.palantir.blueprintjs import org.w3c.dom.events.Event @@ -59,26 +60,33 @@ external interface IProps : RProps { /** A space-delimited list of class names to pass along to a child element. */ var className: String? } + external interface IIntentProps { /** Visual intent color to apply to element. */ var intent: Intent? } + /** Interface for a link, with support for customizing target window. */ external interface ILinkProps { /** Link URL. */ var href: String? + /** Link target attribute. Use `"_blank"` to open in a new window. */ var target: String? } + /** Interface for a controlled input. */ external interface IControlledProps { /** Initial value of the input, for uncontrolled usage. */ var defaultValue: String? + /** Change event handler. Use `event.target.value` for new value. */ var onChange: ((Event) -> Unit)? + /** Form value of the input, for controlled usage. */ var value: String? } + /** * An interface for an option in a list, such as in a `