fix(Dialog): fix Dialog actions and children

eldarlabs · Apr 15, 2016 · d76ea4d · d76ea4d
1 parent 721ddfa
commit d76ea4d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -50,7 +50,7 @@
   "dependencies": {
     "@cycle/core": "^6.0.0",
     "@cycle/isolate": "1.2.0",
-    "@eldarlabs/cycle-ui": "0.6.1",
+    "@eldarlabs/cycle-ui": "0.6.2",
     "autoprefixer": "^6.3.4",
     "classnames": "^2.2.3",
     "cycle-snabbdom": "1.2.1",

diff --git a/src/demo/kitchenSink/components/views/Dialogs.ts b/src/demo/kitchenSink/components/views/Dialogs.ts
@@ -1,8 +1,7 @@
-import { Button, Card, CardTitle, CardActions, Dialog, ButtonFactory } from '@eldarlabs/cycle-ui';
+import { Button, Card, CardTitle, CardText, Dialog } from '@eldarlabs/cycle-ui';
 import { Observable as $ } from 'rx';
-const { button, p } = require('cycle-snabbdom');
+const { p } = require('cycle-snabbdom');
 //import { CycleComponent } from '@eldarlabs/cycle-ui/helpers/cycleDomInterfaces';
-import { Counter } from '../../../counter';
 
 export function Dialogs(sources: any) {
   const DOM = sources.DOM;
@@ -30,12 +29,16 @@ export function Dialogs(sources: any) {
     return (
       Card(sources, null, [
         CardTitle(sources, { title: 'Dialogs (Work in progress)' }, [
-          CardActions(sources, null, [
+          CardText(sources, [
             Button(sources, { className: 'showDialog', label: 'Show Modal Dialog',
               raised: true }).DOM,
             p('is active:' + isDialogActive),
             Dialog({ title: 'Test Dialog', active: isDialogActive,
-              actions: [cancelButton.DOM, saveButton.DOM] }).DOM,
+              actions: [cancelButton.DOM, saveButton] }, [
+                p('This is a dialog'),
+                p('A dialog can have multiple children controls')
+              ]
+            ).DOM
           ]).DOM
         ]).DOM
       ]).DOM