3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-07 01:21:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/staging' into develop

Browse source
This commit is contained in:
Andrey Antukh 2025-01-07 14:54:48 +01:00
commit f878003ab5
2 changed files with 26 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

53
frontend/src/app/plugins/user.cljs
View file

@ -18,26 +18,24 @@
(defn- add-session-properties (defn- add-session-properties
[user-proxy session-id] [user-proxy session-id]
(let [plugin-id (obj/get user-proxy "$plugin")] (crc/add-properties!
(crc/add-properties! user-proxy
user-proxy {:name "$session" :enumerable false :get (constantly session-id)}
{:name "$plugin" :enumerable false :get (constantly plugin-id)}
{:name "$session" :enumerable false :get (constantly session-id)}
{:name "id" {:name "id"
:get (fn [_] (-> (u/locate-profile session-id) :id str))} :get (fn [_] (-> (u/locate-profile session-id) :id str))}
{:name "name" {:name "name"
:get (fn [_] (-> (u/locate-profile session-id) :fullname))} :get (fn [_] (-> (u/locate-profile session-id) :fullname))}
{:name "avatarUrl" {:name "avatarUrl"
:get (fn [_] (cfg/resolve-profile-photo-url (u/locate-profile session-id)))} :get (fn [_] (cfg/resolve-profile-photo-url (u/locate-profile session-id)))}
{:name "color" {:name "color"
:get (fn [_] (-> (u/locate-presence session-id) :color))} :get (fn [_] (-> (u/locate-presence session-id) :color))}
{:name "sessionId" {:name "sessionId"
:get (fn [_] (str session-id))}))) :get (fn [_] (str session-id))}))
(defn current-user-proxy? [p] (defn current-user-proxy? [p]
@ -46,7 +44,8 @@
(defn current-user-proxy (defn current-user-proxy
[plugin-id session-id] [plugin-id session-id]
(-> (obj/reify {:name "CurrentUserProxy"} (-> (obj/reify {:name "CurrentUserProxy"}
:$plugin {:enumerable false :get (fn [] plugin-id)}) :$plugin
{:enumerable false :get (fn [] plugin-id)})
(add-session-properties session-id))) (add-session-properties session-id)))
(defn active-user-proxy? [p] (defn active-user-proxy? [p]
@ -55,7 +54,8 @@
(defn active-user-proxy (defn active-user-proxy
[plugin-id session-id] [plugin-id session-id]
(-> (obj/reify {:name "ActiveUserProxy"} (-> (obj/reify {:name "ActiveUserProxy"}
:$plugin {:enumerable false :get (fn [] plugin-id)} :$plugin
{:enumerable false :get (fn [] plugin-id)}
:position :position
{:get (fn [] (-> (u/locate-presence session-id) :point format/format-point))} {:get (fn [] (-> (u/locate-presence session-id) :point format/format-point))}
@ -66,19 +66,16 @@
(defn- add-user-properties (defn- add-user-properties
[user-proxy data] [user-proxy data]
(let [plugin-id (obj/get user-proxy "$plugin")] (crc/add-properties!
(crc/add-properties! user-proxy
user-proxy {:name "id"
{:name "$plugin" :enumerable false :get (constantly plugin-id)} :get (fn [_] (-> data :id str))}
{:name "id" {:name "name"
:get (fn [_] (-> data :id str))} :get (fn [_] (-> data :fullname))}
{:name "name" {:name "avatarUrl"
:get (fn [_] (-> data :fullname))} :get (fn [_] (cfg/resolve-profile-photo-url data))}))
{:name "avatarUrl"
:get (fn [_] (cfg/resolve-profile-photo-url data))})))
(defn user-proxy (defn user-proxy
[plugin-id data] [plugin-id data]

2
frontend/text-editor/src/editor/content/dom/Style.js
View file

@ -139,7 +139,7 @@ export function normalizeStyles(node, styleDefaults = getStyleDefaultsDeclaratio
// a --fills CSS variable property. // a --fills CSS variable property.
const fills = styleDeclaration.getPropertyValue("--fills"); const fills = styleDeclaration.getPropertyValue("--fills");
const color = styleDeclaration.getPropertyValue("color"); const color = styleDeclaration.getPropertyValue("color");
if (color) { if (color && !fills) {
styleDeclaration.removeProperty("color"); styleDeclaration.removeProperty("color");
styleDeclaration.setProperty("--fills", getFills(color)); styleDeclaration.setProperty("--fills", getFills(color));
} else { } else {