diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index d534365..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,24 +0,0 @@ -# Change Log -All notable changes to this project will be documented in this file. This change log follows the conventions of [keepachangelog.com](http://keepachangelog.com/). - -## [Unreleased][unreleased] -### Changed -- Add a new arity to `make-widget-async` to provide a different widget shape. - -## [0.1.1] - 2016-04-20 -### Changed -- Documentation on how to make the widgets. - -### Removed -- `make-widget-sync` - we're all async, all the time. - -### Fixed -- Fixed widget maker to keep working when daylight savings switches over. - -## 0.1.0 - 2016-04-20 -### Added -- Files from the new template. -- Widget maker public API - `make-widget-sync`. - -[unreleased]: https://github.com/your-name/cljs-react-material-ui/compare/0.1.1...HEAD -[0.1.1]: https://github.com/your-name/cljs-react-material-ui/compare/0.1.0...0.1.1 diff --git a/README.md b/README.md index fac444c..028683f 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,13 @@ This library is interop to get [Material-UI](http://www.material-ui.com/#/) working in Clojurescript. -Current Material-UI version: `0.15.1` +Current Material-UI version: `0.15.2` ###### See Om.Next example app here https://github.com/madvas/cljs-react-material-ui-example ## Installation -- Add `[cljs-react-material-ui "0.2.17"]` to your dependencies +- Add `[cljs-react-material-ui "0.2.18"]` to your dependencies - Exclude `cljsjs/react` from Om or other React library. This is because currently material-ui has to be built together with react to get [onTouchTap](http://www.material-ui.com/#/get-started/installation) event [working](http://stackoverflow.com/questions/29881439/react-tap-events-and-material-ui). This will not be needed in future. for example: `[org.omcljs/om "1.0.0-alpha34" :exclusions [cljsjs/react]]` diff --git a/project.clj b/project.clj index 505602f..43a4c9e 100644 --- a/project.clj +++ b/project.clj @@ -1,8 +1,8 @@ -(defproject cljs-react-material-ui "0.2.17" +(defproject cljs-react-material-ui "0.2.18" :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 [[org.clojure/clojure "1.8.0"] [org.clojure/clojurescript "1.8.40"] - [cljsjs/material-ui "0.15.1-1"]]) + [cljsjs/material-ui "0.15.2-0"]]) diff --git a/src/cljs_react_material_ui/core.cljs b/src/cljs_react_material_ui/core.cljs index a482666..4309841 100644 --- a/src/cljs_react_material_ui/core.cljs +++ b/src/cljs_react_material_ui/core.cljs @@ -33,7 +33,6 @@ (defn mui-theme-provider [& args] (create-mui-cmp js/MaterialUIStyles "MuiThemeProvider" 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)) @@ -45,6 +44,7 @@ (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 dialog [& args] (create-mui-el "Dialog" args)) @@ -64,6 +64,7 @@ (defn make-selectable [& args] (create-mui-el "MakeSelectable" args)) (defn menu [& args] (create-mui-el "Menu" args)) (defn menu-item [& args] (create-mui-el "MenuItem" 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)) @@ -98,4 +99,3 @@ (defn toolbar-title [& args] (create-mui-el "ToolbarTitle" args)) - diff --git a/src/cljs_react_material_ui/elements.clj b/src/cljs_react_material_ui/elements.clj index ecc5c5f..68bec98 100644 --- a/src/cljs_react_material_ui/elements.clj +++ b/src/cljs_react_material_ui/elements.clj @@ -1,6 +1,8 @@ (ns cljs-react-material-ui.elements (:require [cljs-react-material-ui.core :as m])) +; export (\w*) .* +; $1 (def tags '[ AppBar @@ -14,6 +16,7 @@ CardTitle CardText Checkbox + Chip CircularProgress DatePicker Dialog @@ -33,6 +36,7 @@ MakeSelectable Menu MenuItem + MuiThemeProvider Paper Popover RadioButton diff --git a/src/cljs_react_material_ui/reagent.cljs b/src/cljs_react_material_ui/reagent.cljs index 8b3e082..ef96fee 100644 --- a/src/cljs_react_material_ui/reagent.cljs +++ b/src/cljs_react_material_ui/reagent.cljs @@ -15,6 +15,7 @@ (def card-title (r/adapt-react-class (aget js/MaterialUI "CardTitle"))) (def card-text (r/adapt-react-class (aget js/MaterialUI "CardText"))) (def checkbox (r/adapt-react-class (aget js/MaterialUI "Checkbox"))) +(def chip (r/adapt-react-class (aget js/MaterialUI "Chip"))) (def circular-progress (r/adapt-react-class (aget js/MaterialUI "CircularProgress"))) (def date-picker (r/adapt-react-class (aget js/MaterialUI "DatePicker"))) (def dialog (r/adapt-react-class (aget js/MaterialUI "Dialog"))) @@ -34,6 +35,7 @@ (def make-selectable (r/adapt-react-class (aget js/MaterialUI "MakeSelectable"))) (def menu (r/adapt-react-class (aget js/MaterialUI "Menu"))) (def menu-item (r/adapt-react-class (aget js/MaterialUI "MenuItem"))) +(def mui-theme-provider (r/adapt-react-class (aget js/MaterialUI "MuiThemeProvider"))) (def paper (r/adapt-react-class (aget js/MaterialUI "Paper"))) (def popover (r/adapt-react-class (aget js/MaterialUI "Popover"))) (def radio-button (r/adapt-react-class (aget js/MaterialUI "RadioButton"))) diff --git a/src/cljs_react_material_ui/rum.cljs b/src/cljs_react_material_ui/rum.cljs index 1cca8c9..f4f272a 100644 --- a/src/cljs_react_material_ui/rum.cljs +++ b/src/cljs_react_material_ui/rum.cljs @@ -17,6 +17,7 @@ (def card-title (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "CardTitle")) (def card-text (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "CardText")) (def checkbox (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "Checkbox")) +(def chip (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "Chip")) (def circular-progress (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "CircularProgress")) (def date-picker (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "DatePicker")) (def dialog (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "Dialog")) @@ -36,6 +37,7 @@ (def make-selectable (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "MakeSelectable")) (def menu (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "Menu")) (def menu-item (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "MenuItem")) +(def mui-theme-provider (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "MuiThemeProvider")) (def paper (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "Paper")) (def popover (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "Popover")) (def radio-button (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "RadioButton")) @@ -67,4 +69,4 @@ (def toolbar (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "Toolbar")) (def toolbar-group (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "ToolbarGroup")) (def toolbar-separator (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "ToolbarSeparator")) -(def toolbar-title (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "ToolbarTitle")) +(def toolbar-title (cljs-react-material-ui.core/adapt-rum-class js/MaterialUI "ToolbarTitle")) \ No newline at end of file