Skip to content

Update to Material UI v1.0.0-beta4 api, components, styling #45

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.

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
local-install:
lein pom
lein jar
lein install
4 changes: 2 additions & 2 deletions project.clj
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
(defproject cljs-react-material-ui "0.2.48"
(defproject cljs-react-material-ui "0.2.51"
:description "Iterop library for material-ui.com"
:url "https://github.com/madvas/cljs-react-material-ui"
:license {:name "Eclipse Public License"
:url "http://www.eclipse.org/legal/epl-v10.html"}
:dependencies [[cljsjs/material-ui "0.19.0-0"]
:dependencies [[cljsjs/material-ui "1.0.0-beta.40-0"]
[cljsjs/react "15.6.1-1"]
[cljsjs/react-dom "15.6.1-1"]
[org.clojure/clojure "1.8.0"]
Expand Down
90 changes: 61 additions & 29 deletions src/cljs_react_material_ui/core.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
([raw-theme] (->> raw-theme
(transform-keys camel-case)
clj->js
js/MaterialUIStyles.getMuiTheme)))
js/MaterialUIStyles.createMuiTheme)))

(defn color [color-key]
(aget js/MaterialUIStyles "colors" (name (camel-case color-key))))
Expand All @@ -37,67 +37,99 @@
(defn selectable-list [& args] (create-mui-cmp (make-selectable (aget js/MaterialUI "List")) args))

(defn app-bar [& args] (create-mui-el "AppBar" args))
(defn auto-complete [& args] (create-mui-el "AutoComplete" args))
(defn avatar [& args] (create-mui-el "Avatar" args))
(defn backdrop [& args] (create-mui-el "Backdrop" args))
(defn badge [& args] (create-mui-el "Badge" args))
(defn bottom-navigation [& args] (create-mui-el "BottomNavigation" args))
(defn bottom-navigation-item [& args] (create-mui-el "BottomNavigationItem" args))
(defn button [& args] (create-mui-el "Button" args))
(defn button-base [& args] (create-mui-el "ButtonBase" args))
(defn card [& args] (create-mui-el "Card" args))
(defn card-actions [& args] (create-mui-el "CardActions" args))
(defn card-content [& args] (create-mui-el "CardContent" args))
(defn card-header [& args] (create-mui-el "CardHeader" args))
(defn card-media [& args] (create-mui-el "CardMedia" args))
(defn card-title [& args] (create-mui-el "CardTitle" args))
(defn card-text [& args] (create-mui-el "CardText" args))
(defn checkbox [& args] (create-mui-el "Checkbox" args))
(defn chip [& args] (create-mui-el "Chip" args))
(defn circular-progress [& args] (create-mui-el "CircularProgress" args))
(defn date-picker [& args] (create-mui-el "DatePicker" args))
(defn click-away-listener [& args] (create-mui-el "ClickAwayListener" args))
(defn collapse [& args] (create-mui-el "Collapse" args))
(defn css-baseline [& args] (create-mui-el "CssBaseline" args))
(defn dialog [& args] (create-mui-el "Dialog" args))
(defn dialog-actions [& args] (create-mui-el "DialogActions" args))
(defn dialog-content [& args] (create-mui-el "DialogContent" args))
(defn dialog-content-text [& args] (create-mui-el "DialogContentText" args))
(defn dialog-title [& args] (create-mui-el "DialogTitle" args))
(defn divider [& args] (create-mui-el "Divider" args))
(defn drawer [& args] (create-mui-el "Drawer" args))
(defn drop-down-menu [& args] (create-mui-el "DropDownMenu" args))
(defn flat-button [& args] (create-mui-el "FlatButton" args))
(defn floating-action-button [& args] (create-mui-el "FloatingActionButton" args))
(defn font-icon [& args] (create-mui-el "FontIcon" args))
(defn expansion-panel [& args] (create-mui-el "ExpansionPanel" args))
(defn expansion-panel-actions [& args] (create-mui-el "ExpansionPanelActions" args))
(defn expansion-panel-details [& args] (create-mui-el "ExpansionPanelDetails" args))
(defn expansion-panel-summary [& args] (create-mui-el "ExpansionPanelSummary" args))
(defn fade [& args] (create-mui-el "Fade" args))
(defn form-control [& args] (create-mui-el "FormControl" args))
(defn form-control-label [& args] (create-mui-el "FormControlLabel" args))(defn grid-list [& args] (create-mui-el "GridList" args))
(defn form-group [& args] (create-mui-el "FormGroup" args))
(defn form-helper-text [& args] (create-mui-el "FormHelperText" args))
(defn form-label [& args] (create-mui-el "FormLabel" args))
(defn grid [& args] (create-mui-el "Grid" args))
(defn grid-list [& args] (create-mui-el "GridList" args))
(defn grid-tile [& args] (create-mui-el "GridTile" args))
(defn grid-list-tile [& args] (create-mui-el "GridListTile" args))
(defn grid-list-tile-bar [& args] (create-mui-el "GridListTileBar" args))
(defn grow [& args] (create-mui-el "Grow" args))
(defn hidden [& args] (create-mui-el "Hidden" args))
(defn icon [& args] (create-mui-el "Icon" args))
(defn icon-button [& args] (create-mui-el "IconButton" args))
(defn icon-menu [& args] (create-mui-el "IconMenu" args))
(defn input [& args] (create-mui-el "Input" args))
(defn input-adornment [& args] (create-mui-el "InputAdornment" args))
(defn input-label [& args] (create-mui-el "InputLabel" args))
(defn linear-progress [& args] (create-mui-el "LinearProgress" args))
(defn list [& args] (create-mui-el "List" args))
(defn list-item [& args] (create-mui-el "ListItem" args))
(defn list-item-avatar [& args] (create-mui-el "ListItemAvatar" args))
(defn list-item-icon [& args] (create-mui-el "ListItemIcon" args))
(defn list-item-secondary-action [& args] (create-mui-el "ListItemSecondaryAction" args))
(defn list-item-text [& args] (create-mui-el "ListItemText" args))
(defn list-subheader [& args] (create-mui-el "ListSubheader" args))
(defn menu [& args] (create-mui-el "Menu" args))
(defn menu-item [& args] (create-mui-el "MenuItem" args))
(defn menu-list [& args] (create-mui-el "MenuList" args))
(defn mobile-stepper [& args] (create-mui-el "MobileStepper" args))
(defn modal [& args] (create-mui-el "Modal" args))
(defn mui-theme-provider [& args] (create-mui-el "MuiThemeProvider" args))
(defn paper [& args] (create-mui-el "Paper" args))
(defn popover [& args] (create-mui-el "Popover" args))
(defn radio-button [& args] (create-mui-el "RadioButton" args))
(defn radio-button-group [& args] (create-mui-el "RadioButtonGroup" args))
(defn raised-button [& args] (create-mui-el "RaisedButton" args))
(defn refresh-indicator [& args] (create-mui-el "RefreshIndicator" args))
(defn select-field [& args] (create-mui-el "SelectField" args))
(defn slider [& args] (create-mui-el "Slider" args))
(defn subheader [& args] (create-mui-el "Subheader" args))
(defn svg-icon [& args] (create-mui-el "SvgIcon" args))
(defn portal [& args] (create-mui-el "Portal" args))
(defn radio [& args] (create-mui-el "Radio" args))
(defn radio-group [& args] (create-mui-el "RadioGroup" args))
(defn root-ref [& args] (create-mui-el "RootRef" args))
(defn select [& args] (create-mui-el "Select" args))
(defn slide [& args] (create-mui-el "Slide" args))
(defn snackbar [& args] (create-mui-el "Snackbar" args))
(defn snackbar-content [& args] (create-mui-el "SnackbarContent" args))
(defn step [& args] (create-mui-el "Step" args))
(defn step-button [& args] (create-mui-el "StepButton" args))
(defn step-content [& args] (create-mui-el "StepContent" args))
(defn step-icon [& args] (create-mui-el "StepIcon" args))
(defn step-label [& args] (create-mui-el "StepLabel" args))
(defn stepper [& args] (create-mui-el "Stepper" args))
(defn snackbar [& args] (create-mui-el "Snackbar" args))
(defn tabs [& args] (create-mui-el "Tabs" args))
(defn svg-icon [& args] (create-mui-el "SvgIcon" args))
(defn swipeable-drawer [& args] (create-mui-el "SwipeableDrawer" args))
(defn switch [& args] (create-mui-el "Switch" args))
(defn switch-base [& args] (create-mui-el "SwitchBase" args))
(defn tab [& args] (create-mui-el "Tab" args))
(defn table [& args] (create-mui-el "Table" args))
(defn table-body [& args] (create-mui-el "TableBody" args))
(defn table-cell [& args] (create-mui-el "TableCell" args))
(defn table-footer [& args] (create-mui-el "TableFooter" args))
(defn table-header [& args] (create-mui-el "TableHeader" args))
(defn table-header-column [& args] (create-mui-el "TableHeaderColumn" args))
(defn table-head [& args] (create-mui-el "TableHead" args))
(defn table-pagination [& args] (create-mui-el "TablePagination" args))
(defn table-row [& args] (create-mui-el "TableRow" args))
(defn table-row-column [& args] (create-mui-el "TableRowColumn" args))
(defn table-sort-label [& args] (create-mui-el "TableSortLabel" args))
(defn tabs [& args] (create-mui-el "Tabs" args))
(defn text-field [& args] (create-mui-el "TextField" args))
(defn time-picker [& args] (create-mui-el "TimePicker" args))
(defn toggle [& args] (create-mui-el "Toggle" args))
(defn toolbar [& args] (create-mui-el "Toolbar" args))
(defn toolbar-group [& args] (create-mui-el "ToolbarGroup" args))
(defn toolbar-separator [& args] (create-mui-el "ToolbarSeparator" args))
(defn toolbar-title [& args] (create-mui-el "ToolbarTitle" args))
(defn tooltip [& args] (create-mui-el "Tooltip" args))
(defn touch-rippler [& args] (create-mui-el "TouchRippler" args))
(defn typography [& args] (create-mui-el "Typography" args))
(defn zoom [& args] (create-mui-el "Zoom" args))
93 changes: 63 additions & 30 deletions src/cljs_react_material_ui/elements.clj
Original file line number Diff line number Diff line change
@@ -1,76 +1,109 @@
(ns cljs-react-material-ui.elements
(:require [cljs-react-material-ui.core :as m]))
(:require [cljs-react-material-ui.core :as m])
(:import (javax.swing ButtonModel)
(java.lang.invoke SwitchPoint)))

; export (\w*) .*
; $1
(def tags
'[
AppBar
AutoComplete
Avatar
Backdrop
Badge
BottomNavigation
BottomNavigationItem
Button
ButtonBase
Card
CardActions
CardContent
CardHeader
CardMedia
CardTitle
CardText
Checkbox
Chip
CircularProgress
DatePicker
ClickAwayListener
Collapse
CssBaseline
Dialog
DialogActions
DialogContent
DialogContentText
DialogTitle
Divider
Drawer
DropDownMenu
FlatButton
FloatingActionButton
FontIcon
ExpansionPanel
ExpansionPanelActions
ExpansionPanelDetails
ExpansionPanelSummary
Fade
FormControl
FormControlLabel
FormGroup
FormHelperText
FormLabel
Grid
GridList
GridTile
GridListTile
GridListTileBar
Grow
Hidden
Icon
IconButton
IconMenu
Input
InputAdornment
InputLabel
LinearProgress
List
ListItem
makeSelectable
ListItemAvatar
ListItemIcon
ListItemSecondaryAction
ListItemText
ListSubheader
Menu
MenuItem
MenuList
MobileStepper
Modal
MuiThemeProvider
Paper
Popover
RadioButton
RadioButtonGroup
RaisedButton
RefreshIndicator
SelectField
Slider
Subheader
SvgIcon
Portal
Radio
RadioGroup
RootRef
Select
Slide
Snackbar
SnackbarContent
Step
StepButton
StepContent
StepIcon
StepLabel
Stepper
Snackbar
Tabs
SvgIcon
SwipeableDrawer
Switch
SwitchBase
Tab
Table
TableBody
TableCell
TableFooter
TableHeader
TableHeaderColumn
TableHead
TablePagination
TableRow
TableRowColumn
TableSortLabel
Tabs
TextField
TimePicker
Toggle
Toolbar
ToolbarGroup
ToolbarSeparator
ToolbarTitle
Tooltip
TouchRipple
Typography
Zoom
])

(defmacro generate-mui-el-fns [fname]
Expand Down
2 changes: 2 additions & 0 deletions usage.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
### Local use of snapshot builds
make will install this project's current code as a dependency in your local repository