Some updates for widgets v8

Author: yitzchak

src/packages.lisp

@@ -7,9 +7,9 @@
      :accessor widget-indent
      :documentation "Indent the control to align with other controls with a description."
      :trait :bool))
-  (:default-initargs
-    :%model-name "CheckboxModel"
-    :%view-name "CheckboxView")
+  (:default-initargs :%model-name "CheckboxModel"
+		     :%view-name "CheckboxView"
+		     :style (make-instance 'checkbox-style))
   (:documentation "Displays a boolean `value` in the form of a checkbox."))
 
 

src/widgets/checkbox.lisp

@@ -2,22 +2,20 @@
 
 
 (defwidget combobox (description-widget continuous-update-slot disabled-slot placeholder-slot
-                     string-value-slot)
-  ((ensure-option
-     :initarg :ensure-option
-     :initform t
-     :accessor widget-ensure-option
-     :documentation "If set, ensure value is in options. Implies continuous_update=False."
-     :trait :bool)
-   (options
-     :initarg :options
-     :initform nil
-     :accessor widget-options
-     :documentation "Dropdown options for the combobox"
-     :trait :string-list))
-  (:default-initargs
-    :%model-name "ComboboxModel"
-    :%view-name "ComboboxView"))
+		     string-value-slot)
+  ((ensure-option :initarg :ensure-option
+		  :initform t
+		  :accessor widget-ensure-option
+		  :documentation "If set, ensure value is in options. Implies continuous_update=False."
+		  :trait :bool)
+   (options :initarg :options
+	    :initform nil
+	    :accessor widget-options
+	    :documentation "Dropdown options for the combobox"
+	    :trait :string-list))
+  (:default-initargs :%model-name "ComboboxModel"
+		     :%view-name "ComboboxView"
+		     :style (make-instance 'text-style)))
 
 
 

src/widgets/combobox.lisp

@@ -19,11 +19,29 @@
      :accessor widget-align-self
      :documentation "The align-self CSS attribute."
      :trait :string)
-   (border
-     :initarg :border
+   (border-bottom
+     :initarg :border-bottom
      :initform nil
-     :accessor widget-border
-     :documentation "The border CSS attribute."
+     :accessor widget-border-bottom
+     :documentation "The border botom CSS attribute."
+     :trait :string)
+   (border-left
+     :initarg :border-left
+     :initform nil
+     :accessor widget-border-left
+     :documentation "The border left CSS attribute."
+     :trait :string)
+   (border-right
+     :initarg :border-right
+     :initform nil
+     :accessor widget-border-right
+     :documentation "The border right CSS attribute."
+     :trait :string)
+   (border-top
+     :initarg :border-top
+     :initform nil
+     :accessor widget-border-top
+     :documentation "The border top CSS attribute."
      :trait :string)
    (bottom
      :initarg :bottom
@@ -187,18 +205,6 @@
      :accessor widget-overflow
      :documentation "The overflow CSS attribute."
      :trait :string)
-   (overflow-x
-     :initarg :overflow-x
-     :initform nil
-     :accessor widget-overflow-x
-     :documentation "The overflow-x CSS attribute."
-     :trait :string)
-   (overflow-y
-     :initarg :overflow-y
-     :initform nil
-     :accessor widget-overflow-y
-     :documentation "The overflow-y CSS attribute."
-     :trait :string)
    (padding
      :initarg :padding
      :initform nil
@@ -245,21 +251,45 @@ https://developer.mozilla.org/en-US/docs/Web/CSS/Reference
 When a property is also accessible via a shorthand property, we only
 expose the shorthand."))
 
+(defun widget-border (instance)
+  (reduce (lambda (prev current)
+	    (when (equal prev current)
+	      prev))
+	  (list (widget-border-bottom instance)
+		(widget-border-left instance)
+		(widget-border-right instance)
+		(widget-border-top instance))))
 
+(defun (setf widget-border) (new-value instance)
+  (setf (widget-border-bottom instance) new-value
+	(widget-border-left instance) new-value
+	(widget-border-right instance) new-value
+	(widget-border-top instance) new-value)
+  new-value)
 
+(defmethod initialize-instance :after ((instance layout) &rest rest &key border)
+  (setf (widget-border instance) border))
 
 (defwidget dom-widget (widget)
-  ((%dom-classes
-     :initarg :%dom-classes
-     :accessor widget-%dom-classes
-     :documentation "CSS classes applied to widget DOM element"
-     :trait :string-list)
-   (layout
-     :initarg :layout
-     :initform (make-instance 'layout)
-     :accessor widget-layout
-     :documentation "Reference to layout widget."
-     :trait :widget))
+  ((%dom-classes :initarg :%dom-classes
+		 :accessor widget-%dom-classes
+		 :documentation "CSS classes applied to widget DOM element"
+		 :trait :string-list)
+   (layout :initarg :layout
+	   :initform (make-instance 'layout)
+	   :accessor widget-layout
+	   :documentation "Reference to layout widget."
+	   :trait :widget)
+   (tabbable :initarg :tabbable
+	     :initform nil
+	     :accessor widget-tabbable
+	     :documentation "Is widget tabbable?"
+	     :trait :boolean)
+   (tooltip :initarg :tooltip
+	    :initform ""
+	    :accessor widget-tooltip
+	    :documentation "A tooltip caption."
+	    :trait :string))
   (:default-initargs
     ;:%model-name "DOMWidgetModel"
     :%model-module +controls-module+

src/widgets/dom-widget.lisp

@@ -2,69 +2,26 @@
 
 
 (defwidget file-upload (description-widget button-style-slot disabled-slot icon-slot)
-  ((accept
-     :initarg :accept
-     :initform ""
-     :accessor widget-accept
-     :documentation "If set, ensure value is in options. Implies continuous_update=False.	File types to accept, empty string for all."
-     :trait :string)
-   (data
-     :initarg :data
-     :initform nil
-     :accessor widget-data
-     :documentation "List of file content (bytes)"
-     :trait :buffer-list)
-   (error
-     :initarg :error
-     :initform ""
-     :accessor widget-error
-     :documentation "Error message"
-     :trait :string)
-   (metadata
-     :initarg :metadata
-     :initform nil
-     :accessor widget-metadata
-     :documentation "List of file metadata"
-     :trait :json)
-   (multiple
-     :initarg :multiple
-     :initform nil
-     :accessor widget-multiple
-     :documentation "If True, allow for multiple files upload"
-     :trait :bool))
-  (:default-initargs
-    :%model-name "FileUploadModel"
-    :%view-name "FileUploadView"))
-
-
-
-
-(defmethod widget-value ((instance file-upload))
-  (map 'vector
-       (lambda (content metadata)
-         (let ((table (alexandria:copy-hash-table metadata)))
-           (setf (gethash "content" table) content)
-           table))
-       (widget-data instance) (widget-metadata instance)))
-
-
-(defun file-upload-value-notify (instance)
-  (when (and (slot-boundp instance 'data)
-             (slot-boundp instance 'metadata)
-             (= (length (widget-data instance)) (length (widget-metadata instance)))
-             (every (lambda (content metadata)
-                      (= (length content) (gethash "size" metadata)))
-                    (widget-data instance) (widget-metadata instance)))
-    (jupyter::enqueue *trait-notifications*
-                      (list instance :any :value nil (widget-value instance) nil))))
-
-
-(defmethod on-trait-change :after ((instance file-upload) type (name (eql :data)) old-value new-value source)
-  (declare (ignore type name old-value new-value source))
-  (file-upload-value-notify instance))
-
-
-(defmethod on-trait-change :after ((instance file-upload) type (name (eql :metadata)) old-value new-value source)
-  (declare (ignore type name old-value new-value source))
-  (file-upload-value-notify instance))
+  ((accept :initarg :accept
+	   :initform ""
+	   :accessor widget-accept
+	   :documentation "If set, ensure value is in options. Implies continuous_update=False.	File types to accept, empty string for all."
+	   :trait :string)
+   (value :initarg :value
+	  :initform nil
+	  :accessor widget-value
+	  :documentation "The file upload value"
+	  :trait :buffer-list)
+   (error :initarg :error
+	  :initform ""
+	  :accessor widget-error
+	  :documentation "Error message"
+	  :trait :string)
+   (multiple :initarg :multiple
+	     :initform nil
+	     :accessor widget-multiple
+	     :documentation "If True, allow for multiple files upload"
+	     :trait :bool))
+  (:default-initargs :%model-name "FileUploadModel"
+		     :%view-name "FileUploadView"))
 

src/widgets/file-upload.lisp

@@ -7,9 +7,9 @@
 
 (defwidget label (description-widget placeholder-slot string-value-slot)
   ()
-  (:default-initargs
-    :%model-name "LabelModel"
-    :%view-name "LabelView")
+  (:default-initargs :%model-name "LabelModel"
+		     :%view-name "LabelView"
+		     :style (make-instance 'label-style))
   (:documentation "Label widget.
 
 It also renders math inside the string `value` as Latex (requires $ $ or
@@ -18,17 +18,17 @@ $$ $$ and similar latex tags)."))
 
 (defwidget html (label)
   ()
-  (:default-initargs
-    :%model-name "HTMLModel"
-    :%view-name "HTMLView")
+  (:default-initargs :%model-name "HTMLModel"
+		     :%view-name "HTMLView"
+		     :style (make-instance 'html-style))
   (:documentation "Renders the string `value` as HTML."))
 
 
 (defwidget html-math (label)
   ()
-  (:default-initargs
-    :%model-name "HTMLMathModel"
-    :%view-name "HTMLMathView")
+  (:default-initargs :%model-name "HTMLMathModel"
+		     :%view-name "HTMLMathView"
+		     :style (make-instance 'html-math-style))
   (:documentation "Renders the string `value` as HTML, and render mathematics."))