native-document 1.0.264 → 1.0.266

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "native-document",
-  "version": "1.0.264",
+  "version": "1.0.266",
   "description": "A reactive JavaScript framework that preserves native DOM simplicity without sacrificing modern features",
   "author": "AfroCodeur <https://github.com/afrocodeur>",
   "license": "MIT",

package/src/i18n/service/I18nService.js

@@ -27,10 +27,18 @@ const I18nService = (function () {
 }());
 
 const tr = (key, params = {}) => {
+
     const isContainObservable = hasObservableParams(params);
-    const observable = isContainObservable
-        ? Observable.computed(() => I18nService.tr(key, getParams(params)), getObservableParams(params))
-        : Observable(I18nService.tr(key, params));
+    let observable = null;
+    if(key?.__$Observable) {
+        observable = isContainObservable
+            ? Observable.computed(() => I18nService.tr(key.val(), getParams(params)), [key, ...getObservableParams(params)])
+            : Observable.computed(() => I18nService.tr(key.val(), params), [key]);
+    } else {
+        observable = isContainObservable
+            ? Observable.computed(() => I18nService.tr(key, getParams(params)), getObservableParams(params))
+            : Observable(I18nService.tr(key, params));
+    }
 
     i18next.on('languageChanged', (lng) => {
         const data = isContainObservable ? getParams(params) : params;

package/src/router/link.js

@@ -2,6 +2,8 @@ import Validator from '../core/utils/validator';
 import {Link as NativeLink} from '../../elements';
 import Router, {DEFAULT_ROUTER_NAME} from './Router';
 import RouterError from './errors/RouterError';
+import {getObservableParams, hasObservableParams} from '../i18n/service/functions';
+import {Observable} from '../core/data/Observable';
 
 
 export function Link(options, children){
@@ -18,7 +20,17 @@ export function Link(options, children){
     if(!router) {
         throw new RouterError('Router not found "'+routerName+'" for link "'+target.name+'"');
     }
-    const url = router.generateUrl(target.name, target.params, target.query);
+
+    const dependencies = [ ...getObservableParams(target.params), ...getObservableParams(target.query)];
+    let url = '';
+    if(dependencies) {
+        url = Observable.computed(() => {
+            return router.generateUrl(target.name, target.params, target.query);
+        }, dependencies);
+    }
+    else {
+        url = router.generateUrl(target.name, target.params, target.query);
+    }
     return NativeLink({ ...attributes, href: url }, children).nd.onPreventClick(() => {
         router.push(url);
     });

package/src/ui/components/form/fields/RadioFieldRender.js

@@ -37,7 +37,7 @@ const buildOptions = ($desc, instance) => {
         if(!$selected?.__$isObservable) {
             return false;
         }
-        return $selected.transform(v => v === optValue);
+        return $selected.transform(v => v.valueOf() === optValue?.valueOf());
     };
 
     const onSelect = (optValue) => {