wip: book documentation

packages/core-macro/src/props/mod.rs

@@ -262,7 +262,7 @@ mod field_info {
         pub setter: SetterSettings,
     }
 
-    #[derive(Debug, Default, Clone)]
+    #[derive(Debug, Clone)]
     pub struct SetterSettings {
         pub doc: Option<syn::Expr>,
         pub skip: bool,
@@ -270,6 +270,17 @@ mod field_info {
         pub strip_option: bool,
     }
 
+    impl Default for SetterSettings {
+        fn default() -> Self {
+            Self {
+                doc: Default::default(),
+                skip: false,
+                auto_into: false,
+                strip_option: false,
+            }
+        }
+    }
+
     impl FieldBuilderAttr {
         pub fn with(mut self, attrs: &[syn::Attribute]) -> Result<Self, Error> {
             let mut skip_tokens = None;

packages/core/Cargo.toml

@@ -33,10 +33,12 @@ futures-channel = "0.3.16"
 # used for noderefs
 once_cell = "1.8.0"
 
+indexmap = "1.7.0"
+
 # # Serialize the Edits for use in Webview/Liveview instances
 serde = { version = "1", features = ["derive"], optional = true }
 
-indexmap = "1.7.0"
+serde_repr = { version = "0.1.7", optional = true }
 
 [dev-dependencies]
 anyhow = "1.0.42"
@@ -50,7 +52,7 @@ dioxus-core-macro = { path = "../core-macro", version = "0.1.2" }
 
 [features]
 default = ["serialize"]
-serialize = ["serde"]
+serialize = ["serde", "serde_repr"]
 
 [[bench]]
 name = "create"

packages/core/benches/jsframework.rs

@@ -25,7 +25,7 @@ criterion_main!(mbenches);
 fn create_rows(c: &mut Criterion) {
     static App: FC<()> = |cx, _| {
         let mut rng = SmallRng::from_entropy();
-        let rows = (0..10_000).map(|f| {
+        let rows = (0..10_000_usize).map(|f| {
             let label = Label::new(&mut rng);
             rsx! {
                 Row {

packages/core/examples/jsframework.rs

@@ -14,7 +14,7 @@ fn main() {
 
 static App: FC<()> = |cx, props| {
     let mut rng = SmallRng::from_entropy();
-    let rows = (0..10_000).map(|f| {
+    let rows = (0..10_000_usize).map(|f| {
         let label = Label::new(&mut rng);
         rsx! {
             Row {

packages/core/src/events.rs

@@ -769,18 +769,211 @@ pub mod on {
     pub struct ToggleEvent {}
 }
 
-#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(
+    feature = "serialize",
+    derive(serde_repr::Serialize_repr, serde_repr::Deserialize_repr)
+)]
 #[derive(Clone, Copy, Debug)]
+#[repr(u8)]
 pub enum KeyCode {
+    // That key has no keycode, = 0
+    // break, = 3
+    // backspace / delete, = 8
+    // tab, = 9
+    // clear, = 12
+    // enter, = 13
+    // shift, = 16
+    // ctrl, = 17
+    // alt, = 18
+    // pause/break, = 19
+    // caps lock, = 20
+    // hangul, = 21
+    // hanja, = 25
+    // escape, = 27
+    // conversion, = 28
+    // non-conversion, = 29
+    // spacebar, = 32
+    // page up, = 33
+    // page down, = 34
+    // end, = 35
+    // home, = 36
+    // left arrow, = 37
+    // up arrow, = 38
+    // right arrow, = 39
+    // down arrow, = 40
+    // select, = 41
+    // print, = 42
+    // execute, = 43
+    // Print Screen, = 44
+    // insert, = 45
+    // delete, = 46
+    // help, = 47
+    // 0, = 48
+    // 1, = 49
+    // 2, = 50
+    // 3, = 51
+    // 4, = 52
+    // 5, = 53
+    // 6, = 54
+    // 7, = 55
+    // 8, = 56
+    // 9, = 57
+    // :, = 58
+    // semicolon (firefox), equals, = 59
+    // <, = 60
+    // equals (firefox), = 61
+    // ß, = 63
+    // @ (firefox), = 64
+    // a, = 65
+    // b, = 66
+    // c, = 67
+    // d, = 68
+    // e, = 69
+    // f, = 70
+    // g, = 71
+    // h, = 72
+    // i, = 73
+    // j, = 74
+    // k, = 75
+    // l, = 76
+    // m, = 77
+    // n, = 78
+    // o, = 79
+    // p, = 80
+    // q, = 81
+    // r, = 82
+    // s, = 83
+    // t, = 84
+    // u, = 85
+    // v, = 86
+    // w, = 87
+    // x, = 88
+    // y, = 89
+    // z, = 90
+    // Windows Key / Left ⌘ / Chromebook Search key, = 91
+    // right window key, = 92
+    // Windows Menu / Right ⌘, = 93
+    // sleep, = 95
+    // numpad 0, = 96
+    // numpad 1, = 97
+    // numpad 2, = 98
+    // numpad 3, = 99
+    // numpad 4, = 100
+    // numpad 5, = 101
+    // numpad 6, = 102
+    // numpad 7, = 103
+    // numpad 8, = 104
+    // numpad 9, = 105
+    // multiply, = 106
+    // add, = 107
+    // numpad period (firefox), = 108
+    // subtract, = 109
+    // decimal point, = 110
+    // divide, = 111
+    // f1, = 112
+    // f2, = 113
+    // f3, = 114
+    // f4, = 115
+    // f5, = 116
+    // f6, = 117
+    // f7, = 118
+    // f8, = 119
+    // f9, = 120
+    // f10, = 121
+    // f11, = 122
+    // f12, = 123
+    // f13, = 124
+    // f14, = 125
+    // f15, = 126
+    // f16, = 127
+    // f17, = 128
+    // f18, = 129
+    // f19, = 130
+    // f20, = 131
+    // f21, = 132
+    // f22, = 133
+    // f23, = 134
+    // f24, = 135
+    // f25, = 136
+    // f26, = 137
+    // f27, = 138
+    // f28, = 139
+    // f29, = 140
+    // f30, = 141
+    // f31, = 142
+    // f32, = 143
+    // num lock, = 144
+    // scroll lock, = 145
+    // airplane mode, = 151
+    // ^, = 160
+    // !, = 161
+    // ؛ (arabic semicolon), = 162
+    // #, = 163
+    // $, = 164
+    // ù, = 165
+    // page backward, = 166
+    // page forward, = 167
+    // refresh, = 168
+    // closing paren (AZERTY), = 169
+    // *, = 170
+    // ~ + * key, = 171
+    // home key, = 172
+    // minus (firefox), mute/unmute, = 173
+    // decrease volume level, = 174
+    // increase volume level, = 175
+    // next, = 176
+    // previous, = 177
+    // stop, = 178
+    // play/pause, = 179
+    // e-mail, = 180
+    // mute/unmute (firefox), = 181
+    // decrease volume level (firefox), = 182
+    // increase volume level (firefox), = 183
+    // semi-colon / ñ, = 186
+    // equal sign, = 187
+    // comma, = 188
+    // dash, = 189
+    // period, = 190
+    // forward slash / ç, = 191
+    // grave accent / ñ / æ / ö, = 192
+    // ?, / or °, = 193
+    // numpad period (chrome), = 194
+    // open bracket, = 219
+    // back slash, = 220
+    // close bracket / å, = 221
+    // single quote / ø / ä, = 222
+    // `, = 223
+    // left or right ⌘ key (firefox), = 224
+    // altgr, = 225
+    // < /git >, left back slash, = 226
+    // GNOME Compose Key, = 230
+    // ç, = 231
+    // XF86Forward, = 233
+    // XF86Back, = 234
+    // non-conversion, = 235
+    // alphanumeric, = 240
+    // hiragana/katakana, = 242
+    // half-width/full-width, = 243
+    // kanji, = 244
+    // unlock trackpad (Chrome/Edge), = 251
+    // toggle touchpad, = 255
+    NA = 0,
+    Break = 3,
     Backspace = 8,
     Tab = 9,
+    Clear = 12,
     Enter = 13,
     Shift = 16,
     Ctrl = 17,
     Alt = 18,
     Pause = 19,
     CapsLock = 20,
+    // hangul, = 21
+    // hanja, = 25
     Escape = 27,
+    // conversion, = 28
+    // non-conversion, = 29
+    Space = 32,
     PageUp = 33,
     PageDown = 34,
     End = 35,
@@ -789,8 +982,13 @@ pub enum KeyCode {
     UpArrow = 38,
     RightArrow = 39,
     DownArrow = 40,
+    // select, = 41
+    // print, = 42
+    // execute, = 43
+    // Print Screen, = 44
     Insert = 45,
     Delete = 46,
+    // help, = 47
     Num0 = 48,
     Num1 = 49,
     Num2 = 50,
@@ -801,6 +999,12 @@ pub enum KeyCode {
     Num7 = 55,
     Num8 = 56,
     Num9 = 57,
+    // :, = 58
+    // semicolon (firefox), equals, = 59
+    // <, = 60
+    // equals (firefox), = 61
+    // ß, = 63
+    // @ (firefox), = 64
     A = 65,
     B = 66,
     C = 67,
@@ -857,8 +1061,53 @@ pub enum KeyCode {
     F10 = 121,
     F11 = 122,
     F12 = 123,
+    // f13, = 124
+    // f14, = 125
+    // f15, = 126
+    // f16, = 127
+    // f17, = 128
+    // f18, = 129
+    // f19, = 130
+    // f20, = 131
+    // f21, = 132
+    // f22, = 133
+    // f23, = 134
+    // f24, = 135
+    // f25, = 136
+    // f26, = 137
+    // f27, = 138
+    // f28, = 139
+    // f29, = 140
+    // f30, = 141
+    // f31, = 142
+    // f32, = 143
     NumLock = 144,
     ScrollLock = 145,
+    // airplane mode, = 151
+    // ^, = 160
+    // !, = 161
+    // ؛ (arabic semicolon), = 162
+    // #, = 163
+    // $, = 164
+    // ù, = 165
+    // page backward, = 166
+    // page forward, = 167
+    // refresh, = 168
+    // closing paren (AZERTY), = 169
+    // *, = 170
+    // ~ + * key, = 171
+    // home key, = 172
+    // minus (firefox), mute/unmute, = 173
+    // decrease volume level, = 174
+    // increase volume level, = 175
+    // next, = 176
+    // previous, = 177
+    // stop, = 178
+    // play/pause, = 179
+    // e-mail, = 180
+    // mute/unmute (firefox), = 181
+    // decrease volume level (firefox), = 182
+    // increase volume level (firefox), = 183
     Semicolon = 186,
     EqualSign = 187,
     Comma = 188,
@@ -866,10 +1115,27 @@ pub enum KeyCode {
     Period = 190,
     ForwardSlash = 191,
     GraveAccent = 192,
+    // ?, / or °, = 193
+    // numpad period (chrome), = 194
     OpenBracket = 219,
     BackSlash = 220,
     CloseBraket = 221,
     SingleQuote = 222,
+    // `, = 223
+    // left or right ⌘ key (firefox), = 224
+    // altgr, = 225
+    // < /git >, left back slash, = 226
+    // GNOME Compose Key, = 230
+    // ç, = 231
+    // XF86Forward, = 233
+    // XF86Back, = 234
+    // non-conversion, = 235
+    // alphanumeric, = 240
+    // hiragana/katakana, = 242
+    // half-width/full-width, = 243
+    // kanji, = 244
+    // unlock trackpad (Chrome/Edge), = 251
+    // toggle touchpad, = 255
     Unknown,
 }
 

packages/desktop/examples/demo.rs

@@ -5,7 +5,7 @@ use dioxus_core_macro::*;
 use dioxus_html as dioxus_elements;
 
 fn main() {
-    dioxus_desktop::launch(App, |c| c).unwrap();
+    dioxus_desktop::launch(App, |c| c);
 }
 
 static App: FC<()> = |cx, props| {

packages/desktop/src/events.rs

@@ -49,7 +49,9 @@ fn make_synthetic_event(name: &str, val: serde_json::Value) -> Box<dyn Any + Sen
             Box::new(serde_json::from_value::<CompositionEvent>(val).unwrap())
         }
         "keydown" | "keypress" | "keyup" => {
-            Box::new(serde_json::from_value::<KeyboardEvent>(val).unwrap())
+            dbg!(&val);
+            let evt = serde_json::from_value::<KeyboardEvent>(val).unwrap();
+            Box::new(evt)
         }
         "focus" | "blur" => {
             //

packages/desktop/src/index.html

@@ -1,10 +1,14 @@
 <!DOCTYPE html>
 <html>
 
-<head>
+<html>
 
+<head>
+    <!-- <meta name="viewport" content="width=device-width, initial-scale=1.0 maximum-scale=1.0 user-scalable=no"
+        charset="utf-8" /> -->
 </head>
 
+
 <body>
     <div id="_dioxusroot">
     </div>

packages/desktop/src/index.js

@@ -244,7 +244,8 @@ const SerializeMap = {
   "focus": serialize_focus,
   "blur": serialize_focus,
 
-  "change": serialize_change,
+  "change": serialize_form,
+  // "change": serialize_change,
 
   "input": serialize_form,
   "invalid": serialize_form,
@@ -335,16 +336,17 @@ function serialize_composition(event) {
 }
 function serialize_keyboard(event) {
   return {
-    alt_key: event.altKey,
     char_code: event.charCode,
     key: event.key,
-    key_code: event.keyCode,
+    alt_key: event.altKey,
     ctrl_key: event.ctrlKey,
-    locale: event.locale,
-    location: event.location,
     meta_key: event.metaKey,
-    repeat: event.repeat,
+    key_code: event.keyCode,
     shift_key: event.shiftKey,
+    locale: "locale",
+    // locale: event.locale,
+    location: event.location,
+    repeat: event.repeat,
     which: event.which,
   }
 }

packages/mobile/src/lib.rs

@@ -185,7 +185,6 @@ impl<T: 'static + Send> WebviewRenderer<T> {
         });
     }
 }
-// brad johnson go chat
 
 fn main() {
     init_logging();