updates layout rules as latest calcit-editor; bump 0.3.1

README.md

@@ -13,7 +13,7 @@ Support several basic shortcuts from [Clacit Editor](https://github.com/Cirru/ca
 [![Clojars Project](https://img.shields.io/clojars/v/cirru/editor.svg)](https://clojars.org/cirru/editor)
 
 ```clojure
-[cirru/editor "0.3.0-a2"]
+[cirru/editor "0.3.1"]
 ```
 
 Import `comp-editor` like this:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "respo-cirru-editor",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Stack Workflow",
   "main": "index.js",
   "scripts": {
@@ -21,7 +21,7 @@
   "author": "jiyinyiyong",
   "license": "MIT",
   "devDependencies": {
-    "shadow-cljs": "^2.11.5"
+    "shadow-cljs": "^2.11.18"
   },
   "dependencies": {
     "shortid": "^2.2.16"

release.edn

@@ -1,4 +1,4 @@
-{:version "0.3.0",
+{:version "0.3.1",
  :group-id "cirru",
  :artifact-id "editor",
  :skip-tag true,

shadow-cljs.edn

@@ -4,7 +4,7 @@
   :dependencies [
     [mvc-works/hsl "0.1.2"]
     [mvc-works/shell-page "0.1.15"]
-    [respo "0.13.4"]
+    [respo "0.13.9"]
     [respo/ui "0.3.16"]
     [cumulo/util "0.1.12"]
     [org.clojure/core.incubator "0.1.4"]

src/cirru_editor/comp/expression.cljs

@@ -90,7 +90,7 @@
 
 (defcomp
  comp-expression
- (states expression modify! coord level tail? focus on-command head? after-expression?)
+ (states expression modify! coord level tail? focus on-command head? inline?)
  (let [exp-size (count expression), state (or (:data states) false)]
    (if state
      (div
@@ -103,20 +103,25 @@
        :class-name (if (= coord focus) "editor-focused cirru-expression" "cirru-expression"),
        :style (merge
                {}
-               (if (and (shallow? expression)
-                        (not after-expression?)
-                        (not tail?)
-                        (pos? level)
-                        (< (count expression) 5))
-                 style-inline)
+               (if inline? style-inline)
                (if (and tail? (not head?) (pos? level)) style-tail)
                (if (= coord focus) {:border-color (hsl 0 0 100 0.6)})),
        :on {:click (on-click modify! coord focus),
             :keydown (on-keydown state modify! coord on-command)}}
-      (loop [acc [], idx 0, expr expression, child-after-expression? false]
+      (loop [acc [], idx 0, expr expression, prev-kind nil]
         (if (empty? expr)
           acc
           (let [item (first expr)
+                kind (if (string? item)
+                       :leaf
+                       (if (and (<= (count item) 1) (string? (first item)))
+                         :leaf
+                         (case prev-kind
+                           :expr :expr
+                           :inline-expr (if (> (count item) 2) :expr :inline-expr)
+                           :leaf (if (> (count item) 6) :expr :inline-expr)
+                           nil (if (> (count item) 6) :expr :inline-expr)
+                           :expr)))
                 pair [idx
                       (let [child-coord (conj coord idx)
                             child-focus (if (coord-contains? focus child-coord) focus nil)
@@ -135,13 +140,14 @@
                            modify!
                            child-coord
                            (inc level)
-                           (and (or after-expression? (not tail?)) (= (dec exp-size) idx))
+                           (and (not tail?) (= (dec exp-size) idx) (= prev-kind :leaf))
                            child-focus
                            on-command
                            child-head?
-                           child-after-expression?)))]
+                           (or (= kind :inline-expr) (= kind :leaf)))))]
                 next-acc (conj acc pair)]
-            (recur next-acc (inc idx) (rest expr) (vector? item)))))))))
+            (comment println "kinds:" prev-kind kind " at " item)
+            (recur next-acc (inc idx) (rest expr) kind))))))))
 
 (def style-expression
   {:border-style "solid",