@rpcbase/client 0.114.0 → 0.116.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/client",
-  "version": "0.114.0",
+  "version": "0.116.0",
   "scripts": {
     "build-firebase": "webpack -c firebase/webpack.config.js",
     "build": "yarn build-firebase",

package/rts/store/index.js

@@ -48,14 +48,16 @@ const run_query = async({model_name, query, query_key, options}, callback) => {
 
   const replaced_query = replace_query_keys(query, (k) => (k.startsWith("_") && k !== "_id") ? `${UNDERSCORE_PREFIX}${k}` : k)
 
-  // console.time(`query-${model_name}`)
-  // https://github.com/pouchdb/pouchdb/tree/master/packages/node_modules/pouchdb-find#dbcreateindexindex--callback
-  const {docs} = await collection.find({
+  const find_query = {
     selector: replaced_query,
     // DO NOT INCLUDE FIELDS HERE AS IT USES PICK AND WE WOULD GO through the list twice
     // https://github.com/pouchdb/pouchdb/blob/master/packages/node_modules/pouchdb-find/src/adapters/local/find/index.js
     // fields: [""]
-  })
+  }
+
+  // console.time(`query-${model_name}`)
+  // https://github.com/pouchdb/pouchdb/tree/master/packages/node_modules/pouchdb-find#dbcreateindexindex--callback
+  const {docs} = await collection.find(find_query)
   // console.timeEnd(`query-${model_name}`)
 
   let mapped_docs = docs
@@ -76,6 +78,21 @@ const run_query = async({model_name, query, query_key, options}, callback) => {
     })
   }
 
+  if (options.sort) {
+    mapped_docs = mapped_docs.sort((a, b) => {
+      for (const key in options.sort) {
+        // Check if property exists on both objects
+        if (a.hasOwnProperty(key) && b.hasOwnProperty(key)) {
+          const dir = options.sort[key] // Direction of sorting: 1 or -1
+
+          if (a[key] < b[key]) return -1 * dir
+          if (a[key] > b[key]) return 1 * dir
+        }
+      }
+      return 0
+    })
+  }
+
   callback(null, mapped_docs, {source: "cache"})
 }
 

package/ui/Avatar/index.web.js

@@ -14,9 +14,6 @@ const Avatar = ({
 }) => {
   const sizeStyles = SIZE_STYLES[size]
 
-  // TODO: too many re-renders in conv sidebar
-  // console.log("RENDER AVATAR", text)
-
   return (
     <div
       className={cx("font-monospace", className)}
@@ -26,13 +23,11 @@ const Avatar = ({
         alignItems: "center",
         backgroundColor: color,
         userSelect: "none",
-        font: "inherit",
-        fontSize: "inherit",
         ...sizeStyles,
         ...style,
       }}
     >
-      <Text style={{color: textColor}}>{text}</Text>
+      <Text style={{color: textColor, font: "inherit"}}>{text}</Text>
     </div>
   )
 }