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

Fix/remove unknown props #5372

Merged
merged 11 commits into from
May 28, 2019
Merged

Fix/remove unknown props #5372

Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
58d48f7
improvement: OAS3 $ref friendly-name regex in model.jsx (via #5334)
May 2, 2019
96c444e
improvement: relax schema description styling so Markdown can be effe…
May 16, 2019
5d25a0b
improvement: add `isShown` check to <ModelCollapse />'s prop `expande…
May 16, 2019
5628ff0
security: CVE-2018-20834 (via #5368)
shockey May 22, 2019
54c045f
release: v3.22.2
swaggerhub-bot May 22, 2019
e5017bc
Merge remote-tracking branch 'upstream/master' into facelift
May 23, 2019
c5b3051
Merge remote-tracking branch 'upstream/facelift' into facelift
May 24, 2019
ceddf5b
Filter unknown props from being applied to native button (React Warning)
May 24, 2019
f81a640
Filter props without lodash
May 28, 2019
db4bb33
Merge branch 'facelift' into fix/remove-unknown-props
shockey May 28, 2019
0f0e9b1
Merge branch 'facelift' into fix/remove-unknown-props
shockey May 28, 2019
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
8 changes: 5 additions & 3 deletions src/core/components/layout-utils.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,15 @@ export class Button extends React.Component {
mod: "primary"
}

defaultClasses = () => !this.props.unstyled ? `sui-btn sui-btn--${this.props.mod}` : ""
defaultClasses = ({ unstyled, mod }) => !unstyled ? `sui-btn sui-btn--${mod}` : ""

render() {
const { unstyled, mod, className, ...props } = this.props

return (
<button
{...this.props}
className={xclass(this.props.className, this.defaultClasses())}
{...props}
className={xclass(className, this.defaultClasses({ unstyled, mod }))}
/>
)
}
Expand Down