Skip to content
This repository was archived by the owner on Feb 10, 2023. It is now read-only.

Commit e25868e

Browse files
rpiaggiorpiaggio
authored
Merge pull request #122 from rpiaggio/re-props
Omit undefined properties from props objects
2 parents 0af2466 + 8120a08 commit e25868e

File tree

87 files changed

+1065
-1015
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+1065
-1015
lines changed

‎facade/src/main/scala/react/semanticui/addons/confirm/Confirm.scala

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -157,29 +157,31 @@ object Confirm {
157157
trigger: js.UndefOr[VdomNode] = js.undefined
158158
): ConfirmProps = {
159159
val p = as.toJsObject[ConfirmProps]
160-
p.as = as.toJs
161-
p.basic = basic
162-
p.cancelButton = cancelButton.toJs
163-
p.centered = centered
164-
p.className = (className, clazz).toJs
165-
p.closeIcon = closeIcon.map(_.props)
166-
p.closeOnDimmerClick = closeOnDimmerClick
167-
p.closeOnDocumentClick = closeOnDocumentClick
168-
p.confirmButton = confirmButton.toJs
169-
p.content = content.toJs
170-
p.defaultOpen = defaultOpen
171-
p.dimmer = dimmer.toJs
172-
p.eventPool = eventPool
173-
p.header = header.toJs
174-
p.onActionClick = (onActionClickE, onActionClick).toJs
175-
p.onCancel = (onCancelE, onCancel).toJs
176-
p.onClose = (onCloseE, onClose).toJs
177-
p.onConfirm = (onConfirmE, onConfirm).toJs
178-
p.onMount = (onMountE, onMount).toJs.map(f => (_, p: Modal.ModalProps) => f(p))
179-
p.open = open
180-
p.size = size.toJs
181-
p.style = style.map(_.toJsObject)
182-
p.trigger = trigger.toJs
160+
as.toJs.foreach(v => p.as = v)
161+
basic.foreach(v => p.basic = v)
162+
cancelButton.toJs.foreach(v => p.cancelButton = v)
163+
centered.foreach(v => p.centered = v)
164+
(className, clazz).toJs.foreach(v => p.className = v)
165+
closeIcon.map(_.props).foreach(v => p.closeIcon = v)
166+
closeOnDimmerClick.foreach(v => p.closeOnDimmerClick = v)
167+
closeOnDocumentClick.foreach(v => p.closeOnDocumentClick = v)
168+
confirmButton.toJs.foreach(v => p.confirmButton = v)
169+
content.toJs.foreach(v => p.content = v)
170+
defaultOpen.foreach(v => p.defaultOpen = v)
171+
dimmer.toJs.foreach(v => p.dimmer = v)
172+
eventPool.foreach(v => p.eventPool = v)
173+
header.toJs.foreach(v => p.header = v)
174+
(onActionClickE, onActionClick).toJs.foreach(v => p.onActionClick = v)
175+
(onCancelE, onCancel).toJs.foreach(v => p.onCancel = v)
176+
(onCloseE, onClose).toJs.foreach(v => p.onClose = v)
177+
(onConfirmE, onConfirm).toJs.foreach(v => p.onConfirm = v)
178+
(onMountE, onMount).toJs
179+
.map[Modal.RawOnMount](f => (_, p: Modal.ModalProps) => f(p))
180+
.foreach(v => p.onMount = v)
181+
open.foreach(v => p.open = v)
182+
size.toJs.foreach(v => p.size = v)
183+
style.map(_.toJsObject).foreach(v => p.style = v)
184+
trigger.toJs.foreach(v => p.trigger = v)
183185
p
184186
}
185187

‎facade/src/main/scala/react/semanticui/addons/portal/Portal.scala

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -206,25 +206,25 @@ object Portal {
206206
trigger: js.UndefOr[VdomNode] = js.undefined
207207
): PortalProps = {
208208
val p = (new js.Object).asInstanceOf[PortalProps]
209-
p.closeOnDocumentClick = closeOnDocumentClick
210-
p.closeOnEscape = closeOnEscape
211-
p.closeOnPortalMouseLeave = closeOnPortalMouseLeave
212-
p.closeOnTriggerBlur = closeOnTriggerBlur
213-
p.closeOnTriggerClick = closeOnTriggerClick
214-
p.closeOnTriggerMouseLeave = closeOnTriggerMouseLeave
215-
p.defaultOpen = defaultOpen
216-
p.eventPool = eventPool
217-
p.mouseEnterDelay = mouseEnterDelay
218-
p.mouseLeaveDelay = mouseLeaveDelay
219-
p.onClose = (onCloseE, onClose).toJs
220-
p.onMount = (onMountE, onMount).toJs
221-
p.onOpen = (onOpenE, onOpen).toJs
222-
p.onUnmount = (onUnmountE, onUnmount).toJs
223-
p.open = open
224-
p.openOnTriggerClick = openOnTriggerClick
225-
p.openOnTriggerFocus = openOnTriggerFocus
226-
p.openOnTriggerMouseEnter = openOnTriggerMouseEnter
227-
p.trigger = trigger.toJs
209+
closeOnDocumentClick.foreach(v => p.closeOnDocumentClick = v)
210+
closeOnEscape.foreach(v => p.closeOnEscape = v)
211+
closeOnPortalMouseLeave.foreach(v => p.closeOnPortalMouseLeave = v)
212+
closeOnTriggerBlur.foreach(v => p.closeOnTriggerBlur = v)
213+
closeOnTriggerClick.foreach(v => p.closeOnTriggerClick = v)
214+
closeOnTriggerMouseLeave.foreach(v => p.closeOnTriggerMouseLeave = v)
215+
defaultOpen.foreach(v => p.defaultOpen = v)
216+
eventPool.foreach(v => p.eventPool = v)
217+
mouseEnterDelay.foreach(v => p.mouseEnterDelay = v)
218+
mouseLeaveDelay.foreach(v => p.mouseLeaveDelay = v)
219+
(onCloseE, onClose).toJs.foreach(v => p.onClose = v)
220+
(onMountE, onMount).toJs.foreach(v => p.onMount = v)
221+
(onOpenE, onOpen).toJs.foreach(v => p.onOpen = v)
222+
(onUnmountE, onUnmount).toJs.foreach(v => p.onUnmount = v)
223+
open.foreach(v => p.open = v)
224+
openOnTriggerClick.foreach(v => p.openOnTriggerClick = v)
225+
openOnTriggerFocus.foreach(v => p.openOnTriggerFocus = v)
226+
openOnTriggerMouseEnter.foreach(v => p.openOnTriggerMouseEnter = v)
227+
trigger.toJs.foreach(v => p.trigger = v)
228228
p
229229
}
230230

‎facade/src/main/scala/react/semanticui/addons/portal/PortalInner.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ object PortalInner {
8383
): PortalInnerProps = {
8484
val p = (new js.Object).asInstanceOf[PortalInnerProps]
8585
// p.innerRef = innerRef
86-
p.onMount = (onMountE, onMount).toJs
87-
p.onUnmount = (onUnmountE, onUnmount).toJs
86+
(onMountE, onMount).toJs.foreach(v => p.onMount = v)
87+
(onUnmountE, onUnmount).toJs.foreach(v => p.onUnmount = v)
8888
p
8989
}
9090

‎facade/src/main/scala/react/semanticui/addons/radio/Radio.scala

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -212,28 +212,28 @@ object Radio {
212212
value: js.UndefOr[String | JsNumber] = js.undefined
213213
): RadioProps = {
214214
val p = as.toJsObject[RadioProps]
215-
p.as = as.toJs
216-
p.checked = checked
217-
p.className = (className, clazz).toJs
218-
p.defaultChecked = defaultChecked
219-
p.defaultIndeterminate = defaultIndeterminate
220-
p.disabled = disabled
221-
p.fitted = fitted
222-
p.id = id
223-
p.indeterminate = indeterminate
224-
p.label = label
225-
p.name = name
226-
p.onChange = (onChangeE, onChange).toJs
227-
p.onClick = (onClickE, onClick).toJs
228-
p.onMouseDown = (onMouseDownE, onMouseDown).toJs
229-
p.onMouseUp = (onMouseUpE, onMouseUp).toJs
230-
p.radio = radio
231-
p.readOnly = readOnly
232-
p.slider = slider
233-
p.tabIndex = tabIndex
234-
p.toggle = toggle
235-
p.`type` = `type`.toJs
236-
p.value = value
215+
as.toJs.foreach(v => p.as = v)
216+
checked.foreach(v => p.checked = v)
217+
(className, clazz).toJs.foreach(v => p.className = v)
218+
defaultChecked.foreach(v => p.defaultChecked = v)
219+
defaultIndeterminate.foreach(v => p.defaultIndeterminate = v)
220+
disabled.foreach(v => p.disabled = v)
221+
fitted.foreach(v => p.fitted = v)
222+
id.foreach(v => p.id = v)
223+
indeterminate.foreach(v => p.indeterminate = v)
224+
label.foreach(v => p.label = v)
225+
name.foreach(v => p.name = v)
226+
(onChangeE, onChange).toJs.foreach(v => p.onChange = v)
227+
(onClickE, onClick).toJs.foreach(v => p.onClick = v)
228+
(onMouseDownE, onMouseDown).toJs.foreach(v => p.onMouseDown = v)
229+
(onMouseUpE, onMouseUp).toJs.foreach(v => p.onMouseUp = v)
230+
radio.foreach(v => p.radio = v)
231+
readOnly.foreach(v => p.readOnly = v)
232+
slider.foreach(v => p.slider = v)
233+
tabIndex.foreach(v => p.tabIndex = v)
234+
toggle.foreach(v => p.toggle = v)
235+
p.`type` = `type`.toJs
236+
value.foreach(v => p.value = v)
237237
p
238238
}
239239

0 commit comments

Comments
 (0)